Remove unused parameter

Change-Id: I0931d3789527f2df68791fc72fa53127df7577b5
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 a863af6..b5065d0 100755 (executable)
--- a/src/common/include/media-common-db-svc.h
+++ b/src/common/include/media-common-db-svc.h
@@ -93,7 +93,7 @@ typedef int (*GET_NULL_SCAN_FOLDER_LIST)(void *, const char *, const char *, cha
 typedef int (*CHANGE_VALIDITY_ITEM_BATCH)(void *, const char *, const char *, int, int, uid_t, char **);
 //typedef int (*GET_SCAN_DONE_ITEMS)(void *, const char *, const char *, int, int *, char **);
 
-typedef int (*CHECK_DB)(void*, bool*, uid_t, char **);
+typedef int (*CHECK_DB)(void*, uid_t, char **);
 typedef int (*GET_UUID)(void *, char **, char **);
 typedef int (*GET_MMC_INFO)(void *, char **, char **, int *, bool *, char **);
 typedef int (*CHECK_STORAGE)(void *, const char *, const char *, char **, int *, char **);
@@ -148,7 +148,7 @@ int ms_get_null_scan_folder_list(void **handle, const char *stroage_id, const ch
 int ms_change_validity_item_batch(void **handle, const char *storage_id, const char *path, int des_validity, int src_validity, uid_t uid);
 //int ms_get_scan_done_items(void **handle, const char *storage_id, const char *path, int validity, int *count);
 
-int ms_check_db_upgrade(void **handle, bool *need_full_scan, uid_t uid);
+int ms_check_db_upgrade(void **handle, uid_t uid);
 int ms_genarate_uuid(void **handle, char **uuid);
 int ms_get_mmc_info(void **handle, char **storage_name, char **storage_path, int *validity, bool *info_exist);
 int ms_check_storage(void **handle, const char *storage_id, const char *storage_name, char **storage_path, int *validity);

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index b0deef0..d84734c 100755 (executable)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -1014,25 +1014,23 @@ int ms_set_folder_validity(void **handle, const char *storage_id, const char *pa
        return res;
 }
 
-int ms_check_db_upgrade(void **handle, bool *need_full_scan, uid_t uid)
+int ms_check_db_upgrade(void **handle, uid_t uid)
 {
        int lib_index = 0;
        int res = MS_MEDIA_ERR_NONE;
        int ret;
-       bool full_scan = false;
        char *err_msg = NULL;
 
        MS_DBG_FENTER();
 
        for (lib_index = 0; lib_index < lib_num; lib_index++) {
-               ret = ((CHECK_DB)func_array[lib_index][eCHECK_DB])(handle[lib_index], &full_scan, uid, &err_msg);
+               ret = ((CHECK_DB)func_array[lib_index][eCHECK_DB])(handle[lib_index], uid, &err_msg);
                if (ret != 0) {
                        MS_DBG_ERR("error : %s [%s]", g_array_index(so_array, char*, lib_index), err_msg);
                        MS_SAFE_FREE(err_msg);
                        res = MS_MEDIA_ERR_DB_UPDATE_FAIL;
                }
        }
-       *need_full_scan = full_scan;
        MS_DBG_FLEAVE();
 
        return res;

diff --git a/src/mediadb-update.c b/src/mediadb-update.c
index b4364f2..ee3a1e2 100755 (executable)
--- a/src/mediadb-update.c
+++ b/src/mediadb-update.c
@@ -38,7 +38,7 @@ GMainLoop * mainloop = NULL;
 
 int (*svc_connect)                             (void ** handle, uid_t uid, char ** err_msg);
 int (*svc_disconnect)                  (void * handle, char ** err_msg);
-int (*svc_check_db)                    (void * handle, bool *, uid_t uid, char ** err_msg);
+int (*svc_check_db)                    (void * handle, uid_t uid, char ** err_msg);
 int (*svc_get_storage_id)              (void * handle, const char *path, char *storage_id, uid_t uid, char ** err_msg);
 
 void callback(media_request_result_s * result, void *user_data)
@@ -72,7 +72,6 @@ static void __check_media_db(void)
        void *db_handle = NULL;
        char *err_msg = NULL;
        int ret = 0;
-       bool fscan = false;
 
        funcHandle = dlopen("/usr/lib/libmedia-content-plugin.so", RTLD_LAZY);
        if (funcHandle == NULL) {
@@ -88,7 +87,7 @@ static void __check_media_db(void)
        if (ret < 0)
                printf("Error svc_connect\n");
 
-       ret = svc_check_db(db_handle, &fscan, tzplatform_getuid(TZ_USER_NAME), &err_msg);
+       ret = svc_check_db(db_handle, tzplatform_getuid(TZ_USER_NAME), &err_msg);
        if (ret < 0)
                printf("Error svc_check_db\n");
 

diff --git a/src/server/media-server-device-block.c b/src/server/media-server-device-block.c
index 84eb271..707e411 100755 (executable)
--- a/src/server/media-server-device-block.c
+++ b/src/server/media-server-device-block.c
@@ -62,7 +62,6 @@ int ms_usb_insert_handler(const char *mount_path, const char *mount_uuid)
        char *storage_path = NULL;
        void **handle = NULL;
        int validity = 0;
-       bool scan = false;
        uid_t uid;
        ms_dir_scan_type_t scan_type = MS_SCAN_ALL;
 
@@ -77,7 +76,7 @@ int ms_usb_insert_handler(const char *mount_path, const char *mount_uuid)
 
        if (mount_path != NULL && mount_uuid != NULL) {
                /*CHECK DB HERE */
-               ret = ms_check_db_upgrade(handle, &scan, uid);
+               ret = ms_check_db_upgrade(handle, uid);
                if (ret != MS_MEDIA_ERR_NONE) {
                        MS_DBG_ERR("ms_check_db_upgrade failed");
                        goto ERROR;
@@ -231,7 +230,6 @@ int ms_mmc_insert_handler(const char *mount_path)
        bool info_exist = FALSE;
        char *cid = NULL;
        uid_t uid;
-       bool scan = false;
 
        void **db_handle = NULL;
 
@@ -254,7 +252,7 @@ int ms_mmc_insert_handler(const char *mount_path)
 
        ms_get_mmc_id(&cid);
        /* CHECK DB HERE!! */
-       ret = ms_check_db_upgrade(db_handle, &scan, uid);
+       ret = ms_check_db_upgrade(db_handle, uid);
        if (ret != MS_MEDIA_ERR_NONE) {
                MS_DBG_ERR("ms_check_db_upgrade failed [%d]", ret);
                ms_disconnect_db(&db_handle);