Use boolean instead of enumeration

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

diff --git a/lib/include/media-util-internal.h b/lib/include/media-util-internal.h
index 09aed15..b5b9fe7 100755 (executable)
--- a/lib/include/media-util-internal.h
+++ b/lib/include/media-util-internal.h
@@ -26,13 +26,6 @@
 
 #include "media-util-db.h"
 
-#ifndef FALSE
-#define FALSE 0
-#endif
-#ifndef TRUE
-#define TRUE 1
-#endif
-
 #define MS_SAFE_FREE(src)              { if (src) {free(src); src = NULL; } }
 #define MS_MALLOC(src, size)   { if (size > SIZE_MAX || size <= 0) src = NULL; \
                                                        else { src = malloc(size); if (src) memset(src, 0x0, size); } }

diff --git a/src/common/include/media-common-db-svc.h b/src/common/include/media-common-db-svc.h
index 6959e57..c016f19 100755 (executable)
--- a/src/common/include/media-common-db-svc.h
+++ b/src/common/include/media-common-db-svc.h
@@ -42,18 +42,13 @@ typedef struct ms_stg_info_s {
 } ms_stg_info_s;
 
 typedef enum {
-       MS_NOTI_SWITCH_ON = 0,
-       MS_NOTI_SWITCH_OFF = 1,
-} ms_noti_switch_e;
-
-typedef enum {
        MS_ITEM_INSERT          = 0,
        MS_ITEM_DELETE          = 1,
        MS_ITEM_UPDATE  = 2,
 } ms_noti_type_e;
 
 typedef int (*CLEANUP_DB)(sqlite3*, uid_t);
-typedef int (*INSERT_ITEM_BEGIN)(int, int, int);
+typedef int (*INSERT_ITEM_BEGIN)(int, bool, int);
 typedef int (*INSERT_ITEM_END)(uid_t);
 typedef int (*SET_ITEM_VALIDITY_BEGIN)(int);
 typedef int (*SET_ITEM_VALIDITY_END)(uid_t);
@@ -138,7 +133,7 @@ int ms_get_media_type(const char *path, int *media_type);
 bool ms_check_support_media_type(const char *path);
 
 /* FOR BULK COMMIT */
-void ms_register_start(ms_noti_switch_e noti_status, int pid);
+void ms_register_start(bool noti_status, int pid);
 void ms_register_end(uid_t uid);
 void ms_validate_start();
 void ms_validate_end(uid_t uid);

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index ffd29ee..bda454f 100755 (executable)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -937,7 +937,7 @@ int ms_get_folder_id(sqlite3 *handle, const char *storage_id, const char *path,
 }
 
 /* FOR BULK COMMIT */
-void ms_register_start(ms_noti_switch_e noti_status, int pid)
+void ms_register_start(bool noti_status, int pid)
 {
        int lib_index;
        int ret = MS_MEDIA_ERR_NONE;

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index a4adc45..5076698 100755 (executable)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -318,7 +318,7 @@ static int __msc_dir_scan_for_folder(sqlite3 *handle, const char *storage_id, co
                }
 
                ms_bacth_commit_disable(TRUE, TRUE, uid);
-               ms_bacth_commit_enable(TRUE, TRUE, MS_NOTI_SWITCH_OFF, pid);
+               ms_bacth_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);
@@ -632,7 +632,7 @@ static int __msc_dir_scan_for_storage(sqlite3 *handle, const char *storage_id, c
                        goto STOP_SCAN;
 
                /*ms_bacth_commit_disable(handle, TRUE, TRUE, uid);*/
-               ms_bacth_commit_enable(TRUE, TRUE, MS_NOTI_SWITCH_OFF, pid);
+               ms_bacth_commit_enable(TRUE, TRUE, FALSE, pid);
 
                /* get the current path from directory array */
                current_path = g_array_index(dir_array , char*, 0);
@@ -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, MS_NOTI_SWITCH_OFF, 0);
+               ms_bacth_commit_enable(TRUE, TRUE, FALSE, 0);
 
                if (strcmp(scan_data->msg, MEDIA_ROOT_PATH_DISC) == 0) {
                        MS_DBG("[DATA DISC]");
@@ -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, MS_NOTI_SWITCH_OFF, 0);
+                       ms_bacth_commit_enable(TRUE, valid_status, FALSE, 0);
 
                if (scan_type == MS_MSG_STORAGE_ALL) {
                        /* Delete all data before full scanning */
@@ -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, MS_NOTI_SWITCH_ON, pid);
+       ms_bacth_commit_enable(TRUE, FALSE, TRUE, pid);
 
        MS_DBG_WARN("BULK REGISTER START");
 

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index a1043d6..35d8340 100755 (executable)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -295,7 +295,7 @@ gboolean msc_directory_scan_thread(void *data)
                }
                start_path = g_strdup(scan_data->msg);
 
-               ms_bacth_commit_enable(TRUE, TRUE, MS_NOTI_SWITCH_OFF, 0);
+               ms_bacth_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);
@@ -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, MS_NOTI_SWITCH_OFF, 0);
+               ms_bacth_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);
@@ -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, MS_NOTI_SWITCH_ON, pid);
+       ms_bacth_commit_enable(TRUE, FALSE, TRUE, pid);
 
        MS_DBG_WARN("BULK REGISTER START[%d]", pid);