Fix busy handler implementation and update database handle name

Use a more specific database handle name instead of using 'database', since this
may conflict with other global variables from external libraries by accident

Change-Id: If1cca3013dc8558d80722f3582c416243a4e41df
Signed-off-by: Abhay Agarwal <ay.agarwal@samsung.com>

diff --git a/packaging/ua-manager.spec b/packaging/ua-manager.spec
index 478ecff..da14ea7 100644 (file)
--- a/packaging/ua-manager.spec
+++ b/packaging/ua-manager.spec
@@ -1,6 +1,6 @@
 Name:       ua-manager
 Summary:    User awareness manager
-Version:    0.11.2
+Version:    0.11.3
 Release:    1
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz

diff --git a/ua-daemon/include/ua-manager-database.h b/ua-daemon/include/ua-manager-database.h
index c9ad289..997c61a 100644 (file)
--- a/ua-daemon/include/ua-manager-database.h
+++ b/ua-daemon/include/ua-manager-database.h
@@ -28,6 +28,7 @@ extern "C" {
 #endif
 
 #define SQLITE_BUSY_TIMEOUT 500000
+#define SQLITE_MAX_RETRY 10
 
 /* Helper macros */
 #define EXEC(error_code, command, handle_error) do { \

diff --git a/ua-daemon/src/ua-manager-adv-db.c b/ua-daemon/src/ua-manager-adv-db.c
index d9272a8..9ed2b83 100644 (file)
--- a/ua-daemon/src/ua-manager-adv-db.c
+++ b/ua-daemon/src/ua-manager-adv-db.c
@@ -43,7 +43,7 @@ static sqlite3_stmt *select_all_advs;
 /* INSERT statements */
 static sqlite3_stmt *insert_ibeacon_adv;
 
-extern sqlite3 *database;
+extern sqlite3 *database_handle;
 static int max_ibeacon_id;
 
 static void __uam_adv_finalize_delete(void)
@@ -184,7 +184,7 @@ int _uam_db_get_max_ibeacon_id(void)
                case SQLITE_ERROR:
                default:
                        UAM_ERR("Failed to select max ibeacon adv [%d:%s]",
-                               sql_ret, sqlite3_errmsg(database));
+                               sql_ret, sqlite3_errmsg(database_handle));
                }
        } while (sql_ret == SQLITE_ROW);
 
@@ -197,10 +197,10 @@ int _uam_adv_db_deinitialize(void)
 {
        FUNC_ENTRY;
 
-       retv_if(NULL == database, UAM_ERROR_NONE);
+       retv_if(NULL == database_handle, UAM_ERROR_NONE);
 
        __uam_adv_table_info_finalize();
-       sqlite3_close(database);
+       sqlite3_close(database_handle);
 
        FUNC_EXIT;
        return UAM_ERROR_NONE;
@@ -210,7 +210,7 @@ int _uam_adv_db_initialize(void)
 {
        FUNC_ENTRY;
 
-       EXEC(UAM_ERROR_NONE, __uam_adv_table_info_prepare(database), handle_error);
+       EXEC(UAM_ERROR_NONE, __uam_adv_table_info_prepare(database_handle), handle_error);
        if (_uam_db_get_max_ibeacon_id() != UAM_ERROR_NONE)
                goto handle_error;
 
@@ -244,7 +244,7 @@ int _uam_db_insert_adv_info(unsigned int adv_len, const char *iadv)
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to insert ibeacon adv info [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
        }
@@ -287,7 +287,7 @@ GSList *_uam_db_get_all_advs(void)
                case SQLITE_ERROR:
                default:
                        UAM_ERR("Failed to enumerate ibeacon adv info [%d:%s]",
-                               sql_ret, sqlite3_errmsg(database));
+                               sql_ret, sqlite3_errmsg(database_handle));
                }
        } while (sql_ret == SQLITE_ROW);
 
@@ -305,7 +305,7 @@ int _uam_adv_db_clear(void)
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to delete adv data [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
        }

diff --git a/ua-daemon/src/ua-manager-db.c b/ua-daemon/src/ua-manager-db.c
index b4c1ab5..ec9d078 100644 (file)
--- a/ua-daemon/src/ua-manager-db.c
+++ b/ua-daemon/src/ua-manager-db.c
@@ -83,7 +83,7 @@
 
 #define VERSION 1
 
-sqlite3 *database;
+sqlite3 *database_handle;
 static sqlite3_stmt *select_version;
 
 static int __uam_db_exec_sql(char *sql, void *cb)
@@ -92,8 +92,8 @@ static int __uam_db_exec_sql(char *sql, void *cb)
        int sql_ret;
        char *error = NULL;
 
-       if (NULL == database) {
-               UAM_ERR("database is NULL");
+       if (NULL == database_handle) {
+               UAM_ERR("database_handle is NULL");
                return UAM_ERROR_DB_FAILED;
        }
 
@@ -102,12 +102,12 @@ static int __uam_db_exec_sql(char *sql, void *cb)
                return UAM_ERROR_DB_FAILED;
        }
 
-       sql_ret = sqlite3_exec(database, sql, cb, NULL, &error);
+       sql_ret = sqlite3_exec(database_handle, sql, cb, NULL, &error);
        if (SQLITE_OK != sql_ret) {
                UAM_ERR("Failed to execute sql: (%d) %s", sql_ret, error);
                sqlite3_free(error);
-               sqlite3_close(database);
-               database = NULL;
+               sqlite3_close(database_handle);
+               database_handle = NULL;
                return UAM_ERROR_DB_FAILED;
        }
 
@@ -119,7 +119,7 @@ static int __uam_db_open(void)
        FUNC_ENTRY;
        int res = 0;
 
-       res = sqlite3_open_v2(DATABASE_FULL_PATH, &(database),
+       res = sqlite3_open_v2(DATABASE_FULL_PATH, &(database_handle),
                                SQLITE_OPEN_FULLMUTEX | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
        if (SQLITE_OK != res) {
                UAM_ERR("sqlite3_open_v2 failed, (%d)", res);
@@ -135,13 +135,11 @@ static int __uam_db_open(void)
 static int __uam_db_busy(void *data, int attempt)
 {
        FUNC_ENTRY;
-       int* max_attempts;
+       int max_attempts = SQLITE_MAX_RETRY;
 
-       max_attempts = (int*)data;
-
-       if (attempt < *max_attempts) {
+       if (attempt < max_attempts) {
                UAM_WARN("DB locked, attempt number %d, Attempt Remaining %d",
-                       attempt, *max_attempts - attempt);
+                       attempt, max_attempts - attempt);
                usleep(SQLITE_BUSY_TIMEOUT); /* wait for a half second*/
                return 1;
        }
@@ -161,7 +159,7 @@ static int __uam_db_get_version(unsigned int *ver)
        sql = sqlite3_mprintf("PRAGMA user_version");
        sqlite3_stmt *stmt = select_version;
 
-       sql_ret = sqlite3_prepare_v2(database, sql, -1, &stmt, NULL);
+       sql_ret = sqlite3_prepare_v2(database_handle, sql, -1, &stmt, NULL);
        if (sql_ret != SQLITE_OK) {
                stmt = NULL;
                FINALIZE(select_version);
@@ -183,7 +181,7 @@ static int __uam_db_get_version(unsigned int *ver)
                case SQLITE_ERROR:
                default:
                        UAM_ERR("Failed to select database version info [%d:%s]",
-                               sql_ret, sqlite3_errmsg(database));
+                               sql_ret, sqlite3_errmsg(database_handle));
                }
        } while (sql_ret == SQLITE_ROW);
 
@@ -285,16 +283,16 @@ static bool __uam_db_is_table_existing(const char *table)
        }
        sqlite3_stmt *stmt = NULL;
 
-       sql_ret = sqlite3_prepare_v2(database, sql, strlen(sql), &stmt, NULL);
+       sql_ret = sqlite3_prepare_v2(database_handle, sql, strlen(sql), &stmt, NULL);
        if (SQLITE_OK != sql_ret) {
-               UAM_ERR("sqlite3_prepare_v2 failed, [%d:%s]", sql_ret, sqlite3_errmsg(database));
+               UAM_ERR("sqlite3_prepare_v2 failed, [%d:%s]", sql_ret, sqlite3_errmsg(database_handle));
                result = false;
                goto is_table_existing_done;
        }
 
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_ROW) {
-               UAM_ERR("sqlite3_step failed, [%d:%s]", sql_ret, sqlite3_errmsg(database));
+               UAM_ERR("sqlite3_step failed, [%d:%s]", sql_ret, sqlite3_errmsg(database_handle));
                result = false;
                goto is_table_existing_done;
        }
@@ -426,7 +424,6 @@ int _uam_db_initialize_once(void)
        char *sql;
        int ret= UAM_ERROR_NONE;
        int max_retries = 2;
-       int max_attempts = 10;
 
        do {
                /* open database */
@@ -434,9 +431,9 @@ int _uam_db_initialize_once(void)
 
                if (UAM_ERROR_NONE != __uam_db_verify()) {
                        UAM_ERR("Failed to verify database");
-                       sqlite3_close(database);
+                       sqlite3_close(database_handle);
                        unlink(DATABASE_FULL_PATH);
-                       database = NULL;
+                       database_handle = NULL;
                        retv_if(0 == max_retries, UAM_ERROR_DB_FAILED);
                } else {
                        break;
@@ -452,13 +449,13 @@ int _uam_db_initialize_once(void)
                return UAM_ERROR_DB_FAILED;
        }
 
-       if (NULL == database) {
+       if (NULL == database_handle) {
                unlink(DATABASE_FULL_PATH);
                return UAM_ERROR_DB_FAILED;
        }
 
        /* Set how many times we'll repeat our attempts for sqlite_step */
-       if (SQLITE_OK != sqlite3_busy_handler(database, __uam_db_busy, &max_attempts)) {
+       if (SQLITE_OK != sqlite3_busy_handler(database_handle, __uam_db_busy, NULL)) {
                UAM_ERR("Couldn't set busy handler!");
                return UAM_ERROR_DB_FAILED;
        }
@@ -470,7 +467,7 @@ int _uam_db_initialize_once(void)
 int _uam_db_initialize(void)
 {
        FUNC_ENTRY;
-       database = NULL;
+       database_handle = NULL;
 
        /* initialize database */
        EXEC(UAM_ERROR_NONE, _uam_db_initialize_once(), handle_error);
@@ -498,7 +495,7 @@ int _uam_db_deinitialize(void)
 {
        FUNC_ENTRY;
 
-       retv_if(NULL == database, UAM_ERROR_NONE);
+       retv_if(NULL == database_handle, UAM_ERROR_NONE);
 
        _uam_user_db_deinitialize();
        _uam_device_db_deinitialize();

diff --git a/ua-daemon/src/ua-manager-device-db.c b/ua-daemon/src/ua-manager-device-db.c
index d671781..afa7546 100644 (file)
--- a/ua-daemon/src/ua-manager-device-db.c
+++ b/ua-daemon/src/ua-manager-device-db.c
@@ -84,7 +84,7 @@ static sqlite3_stmt *update_device;
 /* INSERT statements */
 static sqlite3_stmt *insert_device_info;
 
-extern sqlite3 *database;
+extern sqlite3 *database_handle;
 static int max_device_number;
 
 static void __uam_device_finalize_delete(void)
@@ -270,7 +270,7 @@ int _uam_db_get_max_device_number(void)
                case SQLITE_ERROR:
                default:
                        UAM_ERR("Failed to enumerate device info [%d:%s]",
-                               sql_ret, sqlite3_errmsg(database));
+                               sql_ret, sqlite3_errmsg(database_handle));
                }
        } while (sql_ret == SQLITE_ROW);
 
@@ -283,10 +283,10 @@ int _uam_device_db_deinitialize(void)
 {
        FUNC_ENTRY;
 
-       retv_if(NULL == database, UAM_ERROR_NONE);
+       retv_if(NULL == database_handle, UAM_ERROR_NONE);
 
        __uam_device_table_devicesinfo_finalize();
-       sqlite3_close(database);
+       sqlite3_close(database_handle);
 
        FUNC_EXIT;
        return UAM_ERROR_NONE;
@@ -296,7 +296,7 @@ int _uam_device_db_initialize(void)
 {
        FUNC_ENTRY;
 
-       EXEC(UAM_ERROR_NONE, __uam_device_table_devicesinfo_prepare(database), handle_error);
+       EXEC(UAM_ERROR_NONE, __uam_device_table_devicesinfo_prepare(database_handle), handle_error);
        if (_uam_db_get_max_device_number() != UAM_ERROR_NONE)
                goto handle_error;
 
@@ -333,7 +333,7 @@ int _uam_device_db_update_device_ip_address(char *device_id, int tech_type,
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to update ip address [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
 
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
@@ -368,7 +368,7 @@ int _uam_device_db_update_device_presence(char *device_id, int tech_type,
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to update presence [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
 
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
@@ -403,7 +403,7 @@ int _uam_device_db_update_device_timestamp(char *device_id, int tech_type,
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to update device timestamp [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
 
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
@@ -450,7 +450,7 @@ int _uam_device_db_update_device_device(char *device_id, int tech_type,
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to update device discriminant [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
 
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
@@ -510,7 +510,7 @@ int _uam_device_db_insert_device_info(int user_id,
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to insert device info [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
        }
@@ -551,7 +551,7 @@ int _uam_device_db_delete_device_info(const char *device_id, int tech_type,
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to delete device info [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
        } else
                UAM_DBG("Device info deleted");
@@ -584,7 +584,7 @@ int _uam_device_db_get_device(char *device_id, int tech_type, char *address,
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to select device info [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
        } else {
                UAM_DBG("Device info found");
@@ -662,7 +662,7 @@ int _uam_db_get_device_number(const char *device_id, int tech_type,
                case SQLITE_ERROR:
                default:
                        UAM_ERR("Failed to enumerate device info [%d:%s]",
-                               sql_ret, sqlite3_errmsg(database));
+                               sql_ret, sqlite3_errmsg(database_handle));
                }
        } while (sql_ret == SQLITE_ROW);
 
@@ -725,7 +725,7 @@ GSList *_uam_device_db_get_all_devices(void)
                case SQLITE_ERROR:
                default:
                        UAM_ERR("Failed to enumerate device info [%d:%s]",
-                               sql_ret, sqlite3_errmsg(database));
+                               sql_ret, sqlite3_errmsg(database_handle));
                }
        } while (sql_ret == SQLITE_ROW);
 
@@ -743,7 +743,7 @@ int _uam_device_db_clear(void)
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to delete device data [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
        }

diff --git a/ua-daemon/src/ua-manager-device-service-db.c b/ua-daemon/src/ua-manager-device-service-db.c
index 819bb4f..7ec3622 100644 (file)
--- a/ua-daemon/src/ua-manager-device-service-db.c
+++ b/ua-daemon/src/ua-manager-device-service-db.c
@@ -69,7 +69,7 @@ static sqlite3_stmt *insert_device_service;
 /* UPDATE statements */
 static sqlite3_stmt *update_device_service;
 
-extern sqlite3 *database;
+extern sqlite3 *database_handle;
 
 static void __uam_device_service_finalize_delete(void)
 {
@@ -233,10 +233,10 @@ int _uam_device_service_db_deinitialize(void)
 {
        FUNC_ENTRY;
 
-       retv_if(NULL == database, UAM_ERROR_NONE);
+       retv_if(NULL == database_handle, UAM_ERROR_NONE);
 
        __uam_device_service_table_devicesinfo_finalize();
-       sqlite3_close(database);
+       sqlite3_close(database_handle);
 
        FUNC_EXIT;
        return UAM_ERROR_NONE;
@@ -246,7 +246,7 @@ int _uam_device_service_db_initialize(void)
 {
        FUNC_ENTRY;
 
-       EXEC(UAM_ERROR_NONE, __uam_device_service_table_deviceservicesinfo_prepare(database),
+       EXEC(UAM_ERROR_NONE, __uam_device_service_table_deviceservicesinfo_prepare(database_handle),
                handle_error);
 
        FUNC_EXIT;
@@ -274,7 +274,7 @@ int _uam_db_insert_service(int device_number, int service_number, gboolean discr
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to insert device-service info [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
        }
@@ -305,7 +305,7 @@ int _uam_db_update_device_service(int device_number, int service_number,
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to insert device-service info [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
        }
@@ -395,7 +395,7 @@ int _uam_device_service_db_clear(void)
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to delete device data [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
        }
@@ -422,7 +422,7 @@ int _uam_db_delete_service_number(int service_number)
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to delete device-service info [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
        } else
                UAM_DBG("Device-service info deleted");
@@ -448,7 +448,7 @@ int _uam_db_delete_device_service_number(int device_number, int service_number)
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to delete device-service info [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
        } else
                UAM_DBG("Device-service info deleted");
@@ -473,7 +473,7 @@ int _uam_db_delete_device_number(int device_number)
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to delete device info [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
        } else
                UAM_DBG("Device info deleted");
@@ -601,7 +601,7 @@ GSList *_uam_db_get_service(int device_number)
                case SQLITE_ERROR:
                default:
                        UAM_ERR("Failed to enumerate device info [%d:%s]",
-                               sql_ret, sqlite3_errmsg(database));
+                               sql_ret, sqlite3_errmsg(database_handle));
                }
        } while (sql_ret == SQLITE_ROW);
 
@@ -665,7 +665,7 @@ int _uam_db_get_device_services_count(const char *device_id, int tech_type,
                case SQLITE_ERROR:
                default:
                        UAM_ERR("Failed to enumerate device info [%d:%s]",
-                               sql_ret, sqlite3_errmsg(database));
+                               sql_ret, sqlite3_errmsg(database_handle));
                }
        } while (sql_ret == SQLITE_ROW);
 
@@ -710,7 +710,7 @@ GSList *_uam_db_get_service_devices_info()
                case SQLITE_ERROR:
                default:
                        UAM_ERR("Failed to enumerate device info [%d:%s]",
-                               sql_ret, sqlite3_errmsg(database));
+                               sql_ret, sqlite3_errmsg(database_handle));
                }
        } while (sql_ret == SQLITE_ROW);
 

diff --git a/ua-daemon/src/ua-manager-service-db.c b/ua-daemon/src/ua-manager-service-db.c
index 58262fd..678e6ed 100644 (file)
--- a/ua-daemon/src/ua-manager-service-db.c
+++ b/ua-daemon/src/ua-manager-service-db.c
@@ -58,7 +58,7 @@ static sqlite3_stmt *update_cycle;
 /* INSERT statements */
 static sqlite3_stmt *insert_service_info;
 
-extern sqlite3 *database;
+extern sqlite3 *database_handle;
 static int max_service_number;
 
 static void __uam_service_finalize_delete(void)
@@ -233,7 +233,7 @@ int _uam_db_get_max_service_number(void)
                case SQLITE_ERROR:
                default:
                        UAM_ERR("Failed to select max service number [%d:%s]",
-                               sql_ret, sqlite3_errmsg(database));
+                               sql_ret, sqlite3_errmsg(database_handle));
                }
        } while (sql_ret == SQLITE_ROW);
 
@@ -246,10 +246,10 @@ int _uam_service_db_deinitialize(void)
 {
        FUNC_ENTRY;
 
-       retv_if(NULL == database, UAM_ERROR_NONE);
+       retv_if(NULL == database_handle, UAM_ERROR_NONE);
 
        __uam_service_table_servicesinfo_finalize();
-       sqlite3_close(database);
+       sqlite3_close(database_handle);
 
        FUNC_EXIT;
        return UAM_ERROR_NONE;
@@ -259,7 +259,7 @@ int _uam_service_db_initialize(void)
 {
        FUNC_ENTRY;
 
-       EXEC(UAM_ERROR_NONE, __uam_service_table_servicesinfo_prepare(database), handle_error);
+       EXEC(UAM_ERROR_NONE, __uam_service_table_servicesinfo_prepare(database_handle), handle_error);
        if (_uam_db_get_max_service_number() != UAM_ERROR_NONE)
                goto handle_error;
 
@@ -299,7 +299,7 @@ int _uam_db_insert_service_info(
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to insert service info [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
        }
@@ -333,7 +333,7 @@ int _uam_db_delete_service_info(const char *service_name)
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to delete service info [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
        } else
                UAM_DBG("Service info deleted");
@@ -353,7 +353,7 @@ int _uam_service_db_clear(void)
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to delete service data [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
        }
@@ -382,7 +382,7 @@ int _uam_db_update_service_cycle(const char *service_name, int cycle)
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to update service timestamp [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
 
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
@@ -430,7 +430,7 @@ int _uam_db_get_service_info(const char *service_name, db_service_info_t *info)
                case SQLITE_ERROR:
                default:
                        UAM_ERR("Failed to enumerate device info [%d:%s]",
-                               sql_ret, sqlite3_errmsg(database));
+                               sql_ret, sqlite3_errmsg(database_handle));
                        error_code = UAM_ERROR_DB_FAILED;
                }
        } while (sql_ret == SQLITE_ROW);
@@ -471,7 +471,7 @@ GSList *_uam_service_db_get_all_services(void)
                case SQLITE_ERROR:
                default:
                        UAM_ERR("Failed to enumerate service info [%d:%s]",
-                               sql_ret, sqlite3_errmsg(database));
+                               sql_ret, sqlite3_errmsg(database_handle));
                }
        } while (sql_ret == SQLITE_ROW);
 

diff --git a/ua-daemon/src/ua-manager-user-db.c b/ua-daemon/src/ua-manager-user-db.c
index 796becc..620161e 100644 (file)
--- a/ua-daemon/src/ua-manager-user-db.c
+++ b/ua-daemon/src/ua-manager-user-db.c
@@ -54,7 +54,7 @@ static sqlite3_stmt *select_max_user_id;
 /* INSERT statements */
 static sqlite3_stmt *insert_user_info;
 
-extern sqlite3 *database;
+extern sqlite3 *database_handle;
 static int max_user_id;
 
 static void __uam_finalize_delete(void)
@@ -208,7 +208,7 @@ int _uam_db_get_max_user_id(void)
                case SQLITE_ERROR:
                default:
                        UAM_ERR("Failed to select max user id [%d:%s]",
-                               sql_ret, sqlite3_errmsg(database));
+                               sql_ret, sqlite3_errmsg(database_handle));
                }
        } while (sql_ret == SQLITE_ROW);
 
@@ -221,7 +221,7 @@ int _uam_user_db_initialize(void)
 {
        FUNC_ENTRY;
 
-       EXEC(UAM_ERROR_NONE, __uam_table_usersinfo_prepare(database), handle_error);
+       EXEC(UAM_ERROR_NONE, __uam_table_usersinfo_prepare(database_handle), handle_error);
 
        if (_uam_db_get_max_user_id() != UAM_ERROR_NONE)
                goto handle_error;
@@ -239,10 +239,10 @@ int _uam_user_db_deinitialize(void)
 {
        FUNC_ENTRY;
 
-       retv_if(NULL == database, UAM_ERROR_NONE);
+       retv_if(NULL == database_handle, UAM_ERROR_NONE);
 
        __uam_table_usersinfo_finalize();
-       sqlite3_close(database);
+       sqlite3_close(database_handle);
 
        FUNC_EXIT;
        return UAM_ERROR_NONE;
@@ -269,7 +269,7 @@ int _uam_db_insert_user_info(int *user_id, const char *name, const char *account
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to insert user info [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
        }
@@ -300,7 +300,7 @@ int _uam_db_delete_by_user_id(int user_id)
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to delete user info [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
        } else
                UAM_DBG("User info deleted");
@@ -328,7 +328,7 @@ int _uam_db_get_user(int user_id, db_user_info_t *info)
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to select user info [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
        } else {
                info = g_new0(db_user_info_t, 1);
@@ -379,7 +379,7 @@ GSList *_uam_db_get_all_users(void)
                case SQLITE_ERROR:
                default:
                        UAM_ERR("Failed to enumerate user info [%d:%s]",
-                               sql_ret, sqlite3_errmsg(database));
+                               sql_ret, sqlite3_errmsg(database_handle));
                }
        } while (sql_ret == SQLITE_ROW);
 
@@ -397,7 +397,7 @@ int _uam_user_db_clear(void)
        sql_ret = sqlite3_step(stmt);
        if (sql_ret != SQLITE_DONE) {
                UAM_ERR("Failed to delete user data [%d:%s]",
-                       sql_ret, sqlite3_errmsg(database));
+                       sql_ret, sqlite3_errmsg(database_handle));
                error_code = UAM_ERROR_DB_FAILED;
                goto handle_error;
        }