Fix typo

bacth to batch

Change-Id: Ic1977c61e5bcc0ec026fe7b50c6fb0ed91cfc7de
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 c016f19..8020a56 100755 (executable)
--- a/src/common/include/media-common-db-svc.h
+++ b/src/common/include/media-common-db-svc.h
@@ -146,7 +146,7 @@ int ms_get_extract_list(sqlite3 *handle, const char* storage_id, int storage_typ
 int ms_update_one_extract_item(sqlite3 *handle, const char* storage_id, int storage_type, void* data);
 int ms_query_do_update_list(sqlite3 *handle);
 
-void ms_bacth_commit_enable(bool ins_status, bool valid_status, bool noti_enable, int pid);
-void ms_bacth_commit_disable(bool ins_status, bool valid_status, uid_t uid);
+void ms_batch_commit_enable(bool ins_status, bool valid_status, bool noti_enable, int pid);
+void ms_batch_commit_disable(bool ins_status, bool valid_status, uid_t uid);
 
 #endif /*_MEDIA_COMMON_DB_SVC_H_*/

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index bda454f..9f03be9 100755 (executable)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -1179,7 +1179,7 @@ bool ms_check_support_media_type(const char *path)
        return true;
 }
 
-void ms_bacth_commit_enable(bool ins_status, bool valid_status, bool noti_enable, int pid)
+void ms_batch_commit_enable(bool ins_status, bool valid_status, bool noti_enable, int pid)
 {
        /*call for bundle commit*/
        if (ins_status) ms_register_start(noti_enable, pid);
@@ -1188,7 +1188,7 @@ void ms_bacth_commit_enable(bool ins_status, bool valid_status, bool noti_enable
        return;
 }
 
-void ms_bacth_commit_disable(bool ins_status, bool valid_status, uid_t uid)
+void ms_batch_commit_disable(bool ins_status, bool valid_status, uid_t uid)
 {
        /*call for bundle commit*/
        if (valid_status) ms_validate_end(uid);

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 5076698..281449f 100755 (executable)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -317,8 +317,8 @@ static int __msc_dir_scan_for_folder(sqlite3 *handle, const char *storage_id, co
                        goto STOP_SCAN;
                }
 
-               ms_bacth_commit_disable(TRUE, TRUE, uid);
-               ms_bacth_commit_enable(TRUE, TRUE, FALSE, pid);
+               ms_batch_commit_disable(TRUE, TRUE, uid);
+               ms_batch_commit_enable(TRUE, TRUE, FALSE, pid);
                /* get the current path from directory array */
                current_path = g_array_index(dir_array , char*, 0);
                g_array_remove_index(dir_array, 0);
@@ -570,7 +570,7 @@ END_SCAN:
 
        __msc_clear_file_list(dir_array);
 
-       ms_bacth_commit_disable(TRUE, TRUE, uid);
+       ms_batch_commit_disable(TRUE, TRUE, uid);
 
        if (ret != MS_MEDIA_ERR_NONE) MS_DBG_INFO("ret : %d", ret);
 
@@ -623,7 +623,7 @@ static int __msc_dir_scan_for_storage(sqlite3 *handle, const char *storage_id, c
 
        scan_function = (scan_type == MS_MSG_STORAGE_ALL) ? ms_scan_item_batch : ms_scan_validate_item;
 
-       ms_bacth_commit_disable(TRUE, TRUE, uid);
+       ms_batch_commit_disable(TRUE, TRUE, uid);
        /*start db update. the number of element in the array , db update is complete.*/
        while (dir_array->len != 0) {
                /*check poweroff status*/
@@ -631,8 +631,8 @@ static int __msc_dir_scan_for_storage(sqlite3 *handle, const char *storage_id, c
                if (ret != MS_MEDIA_ERR_NONE)
                        goto STOP_SCAN;
 
-               /*ms_bacth_commit_disable(handle, TRUE, TRUE, uid);*/
-               ms_bacth_commit_enable(TRUE, TRUE, FALSE, pid);
+               /*ms_batch_commit_disable(handle, TRUE, TRUE, uid);*/
+               ms_batch_commit_enable(TRUE, TRUE, FALSE, pid);
 
                /* get the current path from directory array */
                current_path = g_array_index(dir_array , char*, 0);
@@ -810,7 +810,7 @@ static int __msc_dir_scan_for_storage(sqlite3 *handle, const char *storage_id, c
 
                ms_insert_folder_end(uid);
                /*commit to db before set scan done, fix timing issue storage scan, then folder scan for same folder*/
-               ms_bacth_commit_disable(TRUE, TRUE, uid);
+               ms_batch_commit_disable(TRUE, TRUE, uid);
                ms_set_folder_scan_status(handle, storage_id, current_path, MS_DIR_SCAN_DONE, uid);
 
                if (fd != -1) {
@@ -897,7 +897,7 @@ EXIT:
        __msc_set_storage_scan_cur_path(NULL);
        __msc_clear_file_list(dir_array);
 
-       ms_bacth_commit_disable(TRUE, TRUE, uid);
+       ms_batch_commit_disable(TRUE, TRUE, uid);
 
        if (ret != MS_MEDIA_ERR_NONE) MS_DBG_INFO("ret : %d", ret);
 
@@ -1265,7 +1265,7 @@ gboolean msc_directory_scan_thread(void *data)
                        MS_DBG_ERR("error : %d", err);
 
                /*call for bundle commit*/
-               ms_bacth_commit_enable(TRUE, TRUE, FALSE, 0);
+               ms_batch_commit_enable(TRUE, TRUE, FALSE, 0);
 
                if (strcmp(scan_data->msg, MEDIA_ROOT_PATH_DISC) == 0) {
                        MS_DBG("[DATA DISC]");
@@ -1276,7 +1276,7 @@ gboolean msc_directory_scan_thread(void *data)
                ret = __msc_db_update(handle, storage_id, scan_data);
 
                /*call for bundle commit*/
-               ms_bacth_commit_disable(TRUE, TRUE, uid);
+               ms_batch_commit_disable(TRUE, TRUE, uid);
 
                MS_DBG_WARN("folder scan done, sent cb event path = [%.*s]", MAX_MSG_SIZE, scan_data->msg);
                __msc_call_dir_scan_cb();
@@ -1450,7 +1450,7 @@ gboolean msc_storage_scan_thread(void *data)
                valid_status = (scan_type == MS_MSG_STORAGE_PARTIAL || MS_MSG_STORAGE_ALL == scan_type) ? TRUE : FALSE;
 
                if (scan_type != MS_MSG_STORAGE_INVALID)
-                       ms_bacth_commit_enable(TRUE, valid_status, FALSE, 0);
+                       ms_batch_commit_enable(TRUE, valid_status, FALSE, 0);
 
                if (scan_type == MS_MSG_STORAGE_ALL) {
                        /* Delete all data before full scanning */
@@ -1462,7 +1462,7 @@ gboolean msc_storage_scan_thread(void *data)
 
                /*call for bundle commit*/
                if (scan_type != MS_MSG_STORAGE_INVALID)
-                       ms_bacth_commit_disable(TRUE, valid_status, uid);
+                       ms_batch_commit_disable(TRUE, valid_status, uid);
 
                if (scan_type == MS_MSG_STORAGE_PARTIAL && ret == MS_MEDIA_ERR_NONE) {
                        /*delete invalid folder first, then delete invalid item, avoid to folder was deleted but item not when unmount*/
@@ -1624,7 +1624,7 @@ static int __msc_batch_insert(int pid, GArray *path_array, uid_t uid)
 
        /*start db updating */
        /*call for bundle commit*/
-       ms_bacth_commit_enable(TRUE, FALSE, TRUE, pid);
+       ms_batch_commit_enable(TRUE, FALSE, TRUE, pid);
 
        MS_DBG_WARN("BULK REGISTER START");
 
@@ -1652,7 +1652,7 @@ static int __msc_batch_insert(int pid, GArray *path_array, uid_t uid)
        }
 
        /*call for bundle commit*/
-       ms_bacth_commit_disable(TRUE, FALSE, uid);
+       ms_batch_commit_disable(TRUE, FALSE, uid);
 
        /*disconnect form media db*/
        if (handle) ms_disconnect_db(handle);

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index 35d8340..54a4e3d 100755 (executable)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -295,14 +295,14 @@ gboolean msc_directory_scan_thread(void *data)
                }
                start_path = g_strdup(scan_data->msg);
 
-               ms_bacth_commit_enable(TRUE, TRUE, FALSE, 0);
+               ms_batch_commit_enable(TRUE, TRUE, FALSE, 0);
 
                if (noti_type == MS_ITEM_INSERT)
                        ret = __msc_dir_scan(handle, storage_id, start_path, false, is_recursive, scan_data->uid);
                else
                        ret = __msc_dir_scan(handle, storage_id, start_path, true, is_recursive, scan_data->uid);
 
-               ms_bacth_commit_disable(TRUE, TRUE, scan_data->uid);
+               ms_batch_commit_disable(TRUE, TRUE, scan_data->uid);
 
                if (!ms_delete_invalid_items(handle, storage_id, scan_data->uid))
                        MS_DBG_ERR("deleting invalid items in storage failed");
@@ -405,7 +405,7 @@ gboolean msc_storage_scan_thread(void *data)
                ms_set_db_status(MS_DB_UPDATING, storage_type);
 
                valid_status = (scan_type == MS_MSG_STORAGE_PARTIAL) ? TRUE : FALSE;
-               ms_bacth_commit_enable(TRUE, valid_status, FALSE, 0);
+               ms_batch_commit_enable(TRUE, valid_status, FALSE, 0);
 
                if (scan_type == MS_MSG_STORAGE_PARTIAL) {
                        ret = ms_validity_change_all_items(handle, storage_id, false, scan_data->uid);
@@ -418,7 +418,7 @@ gboolean msc_storage_scan_thread(void *data)
                ret = __msc_db_update(handle, storage_id, scan_data);
 
                /*call for bundle commit*/
-               ms_bacth_commit_disable(TRUE, valid_status, scan_data->uid);
+               ms_batch_commit_disable(TRUE, valid_status, scan_data->uid);
 
                if (scan_type == MS_MSG_STORAGE_PARTIAL && ret == MS_MEDIA_ERR_NONE) {
                        if (!ms_delete_invalid_items(handle, storage_id, scan_data->uid))
@@ -566,7 +566,7 @@ static int __msc_batch_insert(int pid, GArray *path_array, uid_t uid)
 
        /*start db updating */
        /*call for bundle commit*/
-       ms_bacth_commit_enable(TRUE, FALSE, TRUE, pid);
+       ms_batch_commit_enable(TRUE, FALSE, TRUE, pid);
 
        MS_DBG_WARN("BULK REGISTER START[%d]", pid);
 
@@ -593,7 +593,7 @@ static int __msc_batch_insert(int pid, GArray *path_array, uid_t uid)
        }
 
        /*call for bundle commit*/
-       ms_bacth_commit_disable(TRUE, FALSE, uid);
+       ms_batch_commit_disable(TRUE, FALSE, uid);
 
        /*disconnect form media db*/
        if (handle) ms_disconnect_db(handle);