Remove unused sqlite handles

Change-Id: I34a41750f38f5fd25a4e3454d0f168e7e6587fc1
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/src/common/include/media-common-db-svc.h b/src/common/include/media-common-db-svc.h
index 865217b900f36ed4afc54ab229995cd8b6f44187..f5ea85af72bfcfe6010c5c27ce5758cac04ca887 100644 (file)
--- a/src/common/include/media-common-db-svc.h
+++ b/src/common/include/media-common-db-svc.h
@@ -47,14 +47,14 @@ int ms_connect_db(sqlite3 **handle, uid_t uid);
 void ms_disconnect_db(sqlite3 *handle);
 int ms_validate_item(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
 int ms_insert_item_batch(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
-int ms_validity_change_all_items(sqlite3 *handle, const char *storage_id, bool validity, uid_t uid);
+int ms_validity_change_all_items(const char *storage_id, bool validity, uid_t uid);
 int ms_delete_invalid_items(sqlite3 *handle, const char *storage_id, uid_t uid);
-int ms_set_folder_item_validity(sqlite3 *handle, const char *storage_id, const char *path, int validity, int recursive, uid_t uid);
+int ms_set_folder_item_validity(const char *storage_id, const char *path, int validity, int recursive, uid_t uid);
 int ms_send_dir_update_noti(const char *path, const char *folder_id, ms_noti_type_e noti_type, int pid);
 int ms_get_storage_id(sqlite3 *handle, const char *path, char *storage_id, uid_t uid);
 int ms_insert_folder(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
 int ms_delete_invalid_folder(const char *storage_id, uid_t uid);
-int ms_set_folder_validity(sqlite3 *handle, const char *start_path, int validity, bool is_recursive, uid_t uid);
+int ms_set_folder_validity(const char *start_path, int validity, bool is_recursive, uid_t uid);
 int ms_check_db(sqlite3 *handle, uid_t uid);
 int ms_check_storage(sqlite3 *handle, const char *storage_id, char **storage_path, int *validity);
 int ms_insert_storage(sqlite3 *handle, const char *storage_id, const char *storage_path, uid_t uid);
@@ -67,7 +67,7 @@ void ms_register_start(bool noti_status, int pid);
 void ms_register_end(uid_t uid);
 
 #ifdef _USE_TVPD_MODE
-int ms_set_subfolder_validity(sqlite3 *handle, const char *path, int validity, uid_t uid);
+int ms_set_subfolder_validity(const char *path, int validity, uid_t uid);
 int ms_update_folder_time(sqlite3 *handle, char *folder_path, uid_t uid);
 int ms_set_storage_scan_status(const char *storage_id, media_scan_status_e scan_status, uid_t uid);
 int ms_genarate_uuid(char **uuid);

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index e037f3d4a257ac26cfb044093e3084a1da67c789..57d4bf1b8c6c6624864614fc080ad412ab945f47 100644 (file)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -41,7 +41,7 @@ typedef int (*INSERT_ITEM)(sqlite3 *, const char *, const char *, uid_t);
 typedef int (*SET_ITEM_VALIDITY)(const char *, int, uid_t);
 typedef int (*GET_STORAGE_ID)(sqlite3 *, const char *, char *, uid_t uid);
 typedef int (*INSERT_FOLDER)(sqlite3 *, const char *, const char *, uid_t);
-typedef int (*SET_FOLDER_VALIDITY)(sqlite3 *, const char *, int, bool, uid_t);
+typedef int (*SET_FOLDER_VALIDITY)(const char *, int, bool, uid_t);
 
 typedef int (*CHECK_DB)(sqlite3 *, uid_t);
 typedef int (*CHECK_STORAGE)(sqlite3 *, const char *, char **, int *);
@@ -256,7 +256,7 @@ int ms_validate_item(sqlite3 *handle, const char *storage_id, const char *path,
        return ret;
 }
 
-int ms_validity_change_all_items(sqlite3 *handle, const char *storage_id, bool validity , uid_t uid)
+int ms_validity_change_all_items(const char *storage_id, bool validity , uid_t uid)
 {
        sql_autoptr sql = NULL;
 
@@ -327,7 +327,7 @@ int ms_delete_invalid_items(sqlite3 *handle, const char *storage_id, uid_t uid)
        return MS_MEDIA_ERR_NONE;
 }
 
-int ms_set_folder_item_validity(sqlite3 *handle, const char *storage_id, const char *path, int validity, int recursive, uid_t uid)
+int ms_set_folder_item_validity(const char *storage_id, const char *path, int validity, int recursive, uid_t uid)
 {
        sql_autoptr sql = NULL;
 
@@ -387,11 +387,11 @@ int ms_delete_invalid_folder(const char *storage_id, uid_t uid)
        return media_db_update_db_direct(sql, uid);
 }
 
-int ms_set_folder_validity(sqlite3 *handle, const char *path, int validity, bool is_recursive, uid_t uid)
+int ms_set_folder_validity(const char *path, int validity, bool is_recursive, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
 
-       ret = ((SET_FOLDER_VALIDITY)func_array[eSET_FOLDER_VALIDITY])(handle, path, validity, is_recursive, uid);
+       ret = ((SET_FOLDER_VALIDITY)func_array[eSET_FOLDER_VALIDITY])(path, validity, is_recursive, uid);
        MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "SET_FOLDER_VALIDITY failed [%d]", ret);
 
        return ret;
@@ -526,7 +526,7 @@ void ms_register_end(uid_t uid)
 }
 
 #ifdef _USE_TVPD_MODE
-int ms_set_subfolder_validity(sqlite3 *handle, const char *path, int validity, uid_t uid)
+int ms_set_subfolder_validity(const char *path, int validity, uid_t uid)
 {
        sql_autoptr sql = NULL;
 

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index eb4d843c60f39728d175d147e5b0620e1172fa22..89a836cc161f71c45a1e8c368991c3d33bcebb03 100644 (file)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -209,7 +209,7 @@ static int __msc_dir_scan_for_folder(sqlite3 *handle, const char *storage_id, ch
 
                MS_DBG_SWARN("ms_insert_folder insert path[%s]", new_start_path);
        } else {
-               if (ms_set_folder_validity(handle, new_start_path, MS_INVALID, is_recursive, uid) != MS_MEDIA_ERR_NONE)
+               if (ms_set_folder_validity(new_start_path, MS_INVALID, is_recursive, uid) != MS_MEDIA_ERR_NONE)
                        MS_DBG_ERR("set_folder_validity failed [%d] ", msg_type);
        }
 
@@ -891,9 +891,9 @@ gpointer msc_directory_scan_thread(gpointer data)
                        ms_get_folder_scan_status(handle, scan_data->msg, (int*)&scan_status);
 
                        if (scan_status == MS_DIR_SCAN_DONE)
-                               ms_set_folder_item_validity(handle, scan_data->storage_id, scan_data->msg, MS_VALID_V2, MS_RECURSIVE, scan_data->uid);
+                               ms_set_folder_item_validity(scan_data->storage_id, scan_data->msg, MS_VALID_V2, MS_RECURSIVE, scan_data->uid);
                        else
-                               ms_set_folder_item_validity(handle, scan_data->storage_id, scan_data->msg, MS_INVALID, MS_RECURSIVE, scan_data->uid);
+                               ms_set_folder_item_validity(scan_data->storage_id, scan_data->msg, MS_INVALID, MS_RECURSIVE, scan_data->uid);
 
                        msc_send_result_partial(ret, MS_MSG_RECURSIVE_START, scan_data->pid, scan_data->msg);
                } else {
@@ -937,11 +937,11 @@ gpointer msc_directory_scan_thread(gpointer data)
                                MS_DBG_WARN("check [%.*s] has been modified !!", MAX_MSG_SIZE, scan_data->msg);
                        }
 
-                       ret = ms_set_subfolder_validity(handle, scan_data->msg, MS_INVALID, scan_data->uid);
+                       ret = ms_set_subfolder_validity(scan_data->msg, MS_INVALID, scan_data->uid);
                        if (ret != MS_MEDIA_ERR_NONE)
                                MS_DBG_ERR("error : %d", ret);
 
-                       ret = ms_set_folder_item_validity(handle, scan_data->storage_id, scan_data->msg, MS_INVALID, MS_NON_RECURSIVE, scan_data->uid);
+                       ret = ms_set_folder_item_validity(scan_data->storage_id, scan_data->msg, MS_INVALID, MS_NON_RECURSIVE, scan_data->uid);
                        if (ret != MS_MEDIA_ERR_NONE)
                                MS_DBG_ERR("error : %d", ret);
                }

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index 4390fa0e982624a5268bf9df38f588fb52c25d75..1d8bad0a04d4c9b5eeb9d4cecb62ba1e9399eeaa 100644 (file)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -146,11 +146,11 @@ static int __msc_db_update(sqlite3 *handle, const char *storage_id, const ms_com
 
        } else {
                MS_DBG_INFO("INVALID");
-               err = ms_validity_change_all_items(handle, storage_id, false, scan_data->uid);
+               err = ms_validity_change_all_items(storage_id, false, scan_data->uid);
                if (err != MS_MEDIA_ERR_NONE)
                        MS_DBG_ERR("error : %d", err);
 
-               ms_set_folder_validity(handle, start_path, 0, true, scan_data->uid);
+               ms_set_folder_validity(start_path, 0, true, scan_data->uid);
 
                g_free(start_path);
        }
@@ -196,10 +196,10 @@ static int __msc_directory_scan_update_and_delete(sqlite3 *handle, ms_comm_msg_s
        MS_DBG_RETVM_IF(!handle, MS_MEDIA_ERR_INVALID_PARAMETER, "handle is NULL");
        MS_DBG_RETVM_IF(!scan_data, MS_MEDIA_ERR_INVALID_PARAMETER, "scan_data is NULL");
 
-       ret = ms_set_folder_validity(handle, scan_data->msg, MS_SCANNING, is_recursive, scan_data->uid);
+       ret = ms_set_folder_validity(scan_data->msg, MS_SCANNING, is_recursive, scan_data->uid);
        MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "ms_set_folder_validity failed");
 
-       ret = ms_set_folder_item_validity(handle, scan_data->storage_id, scan_data->msg, MS_SCANNING, is_recursive, scan_data->uid);
+       ret = ms_set_folder_item_validity(scan_data->storage_id, scan_data->msg, MS_SCANNING, is_recursive, scan_data->uid);
        MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "ms_set_folder_item_validity failed");
 
        start_path = g_strdup(scan_data->msg);
@@ -311,7 +311,7 @@ static int __msc_storage_scan_partial(ms_comm_msg_s *scan_data)
 
        ms_set_power_mode(MS_DB_UPDATING);
 
-       ret = ms_validity_change_all_items(handle, scan_data->storage_id, false, scan_data->uid);
+       ret = ms_validity_change_all_items(scan_data->storage_id, false, scan_data->uid);
        if (ret != MS_MEDIA_ERR_NONE) {
                MS_DBG_ERR("ms_validity_change_all_items failed");
                ms_disconnect_db(handle);

diff --git a/src/server/media-server-device-block.c b/src/server/media-server-device-block.c
index 586beb90221357f1dce06c219ab212c4f36cbf82..081fedfab457c606bc648452db2848ca5fac06eb 100644 (file)
--- a/src/server/media-server-device-block.c
+++ b/src/server/media-server-device-block.c
@@ -77,10 +77,8 @@ int ms_storage_insert_handler(const char *mount_path, const char *mount_uuid)
                                MS_DBG_ERR("ms_set_storage_scan_status failed");
 #endif
                        MS_DBG_WARN("init storage data in DB");
-                       /* update storage_id table set validity=0 first */
-                       ms_validity_change_all_items(handle, mount_uuid, false, uid);
-                       /*update folder table set validity = 0*/
-                       ms_set_folder_validity(handle, storage_path, MS_INVALID, true, uid);
+                       ms_validity_change_all_items(mount_uuid, false, uid);
+                       ms_set_folder_validity(storage_path, MS_INVALID, true, uid);
 #ifdef _USE_TVPD_MODE
                        /* update folder table set scan_status=0 first */
                        ms_set_folder_scan_status(mount_uuid, NULL, MS_DIR_SCAN_NONE, uid);
@@ -114,20 +112,13 @@ ERROR:
 
 void ms_storage_remove_handler(const char *mount_path, const char *mount_uuid)
 {
-       sqlite3 *handle = NULL;
        uid_t uid = ms_sys_get_uid();
 
        if (mount_path && mount_uuid) {
-               ms_connect_db(&handle, uid);
                ms_set_storage_validity(mount_uuid, 0, uid);
                ms_send_storage_scan_request(mount_path, mount_uuid, MS_SCAN_INVALID, uid);
-
-               ms_disconnect_db(handle);
        } else if (mount_path && g_strcmp0(mount_path, STORAGE_REMOVED) == 0) {
-               ms_connect_db(&handle, uid);
                ms_set_all_storage_validity(0, uid);
-
-               ms_disconnect_db(handle);
        }
 }
 
@@ -149,11 +140,8 @@ void ms_device_handle_usb_added(const char *mount_path)
 
                ms_get_added_storage_path(mount_path, &storage_id);
 
-               /* update storage_id table set validity=0 first */
-               ms_validity_change_all_items(handle, storage_id, false, uid);
-               /* update folder table set validity=0 first */
-               ms_set_folder_validity(handle, mount_path, MS_INVALID, true, uid);
-               /* update folder table set scan_status=0 first */
+               ms_validity_change_all_items(storage_id, false, uid);
+               ms_set_folder_validity(mount_path, MS_INVALID, true, uid);
                ms_set_folder_scan_status(storage_id, NULL, MS_DIR_SCAN_NONE, uid);
 
                if (storage_id != NULL) {
@@ -174,8 +162,8 @@ void ms_device_handle_usb_added(const char *mount_path)
                                if (ms_set_storage_scan_status(storage_id, MEDIA_SCAN_PREPARE, uid) != MS_MEDIA_ERR_NONE)
                                        MS_DBG_ERR("ms_set_storage_scan_status failed");
 
-                               ms_validity_change_all_items(handle, storage_id, false, uid);
-                               ms_set_folder_validity(handle, mount_path, MS_INVALID, true, uid);
+                               ms_validity_change_all_items(storage_id, false, uid);
+                               ms_set_folder_validity(mount_path, MS_INVALID, true, uid);
 
                                media_db_update_send(getpid(), MS_MEDIA_ITEM_STORAGE, MS_MEDIA_ITEM_UPDATE, mount_path, storage_id, 0, PROD_CUSTOM_MIME_ADDED);
                        } else {
@@ -223,11 +211,10 @@ void ms_device_handle_usb_removed(const char *mount_path)
 
        ms_set_storage_validity(device_id, 0, uid);
 
-       /* update storage_id table set validity=0 first */
-       if (ms_validity_change_all_items(handle, device_id, false, uid) != MS_MEDIA_ERR_NONE)
+       if (ms_validity_change_all_items(device_id, false, uid) != MS_MEDIA_ERR_NONE)
                MS_DBG_ERR("ms_validity_change_all_items failed");
        /* folder validity set 0 under the start_path in folder table*/
-       if (ms_set_folder_validity(handle, mount_path, MS_INVALID, true, uid) != MS_MEDIA_ERR_NONE)
+       if (ms_set_folder_validity(mount_path, MS_INVALID, true, uid) != MS_MEDIA_ERR_NONE)
                MS_DBG_ERR("set_folder_validity failed");
 
        if (ms_get_scanner_status()) {
@@ -371,10 +358,8 @@ int ms_check_mounted_storage(uid_t uid)
                                        }
 
                                        ms_set_storage_validity(storage_id, 1, uid);
-                                       /* update storage_id table set validity=0 first */
-                                       ms_validity_change_all_items(handle, storage_id, false, uid);
-                                       ms_set_folder_validity(handle, mounted_path, MS_INVALID, true, uid);
-                                       /* update folder table set scan_status=0 first */
+                                       ms_validity_change_all_items(storage_id, false, uid);
+                                       ms_set_folder_validity(mounted_path, MS_INVALID, true, uid);
                                        ms_set_folder_scan_status(storage_id, NULL, MS_DIR_SCAN_NONE, uid);
 
                                        scan_type = MS_SCAN_PART;