Modify the conflicting value for db

Change-Id: I7c0c5e4ecb2873dc29cc03c71c5fb08a11499b6e

diff --git a/include/stc-db.h b/include/stc-db.h
index fd3721d..adc3eda 100644 (file)
--- a/include/stc-db.h
+++ b/include/stc-db.h
@@ -21,7 +21,6 @@
 
 #define MAX_DB_RETRY_COUNT 5
 #define MAX_USLEEP_TIMEOUT 500000
 
 #define MAX_DB_RETRY_COUNT 5
 #define MAX_USLEEP_TIMEOUT 500000

-#define SQLITE_BUSY_TIMEOUT 500000

 #define MAX_IFACE_LENGTH 32
 
 /**
 #define MAX_IFACE_LENGTH 32
 
 /**

diff --git a/manager/database/db-common.c b/manager/database/db-common.c
index f8c217d..0992560 100644 (file)
--- a/manager/database/db-common.c
+++ b/manager/database/db-common.c
@@ -24,7 +24,7 @@
 #include "db/table-firewall.h"
 #include "db-internal.h"
 
 #include "db/table-firewall.h"
 #include "db-internal.h"
 

-#define SQLITE_BUSY_TIMEOUT 500000
+#define STC_DB_BUSY_TIMEOUT 500000

 
 static sqlite3 *database;
 
 
 static sqlite3 *database;
 


@@ -35,7 +35,7 @@ static int __stc_db_busy(void *user, int attempts)
        STC_LOGE("DB locked by another process, attempts number %d",
                 attempts);
 
        STC_LOGE("DB locked by another process, attempts number %d",
                 attempts);
 

-       usleep(SQLITE_BUSY_TIMEOUT); /* wait for a half second*/
+       usleep(STC_DB_BUSY_TIMEOUT); /* wait for a half second*/

        __STC_LOG_FUNC_EXIT__;
        return 1;
 }
        __STC_LOG_FUNC_EXIT__;
        return 1;
 }