Change return type int to void

Change-Id: I714b38fb8ec8ba741b9ecfdbe6bd7326582a87ab

diff --git a/src/scanner-v2/include/media-scanner-extract-v2.h b/src/scanner-v2/include/media-scanner-extract-v2.h
index b409236..15e08c0 100755 (executable)
--- a/src/scanner-v2/include/media-scanner-extract-v2.h
+++ b/src/scanner-v2/include/media-scanner-extract-v2.h
@@ -38,8 +38,8 @@ void msc_deinit_extract_thread(void);
 gpointer msc_folder_extract_thread(gpointer data);
 gpointer msc_storage_extract_thread(gpointer data);
 void msc_insert_exactor_request(ms_msg_type_e msg_type, bool ins_status, const char *storage_id, const char *path, int pid, uid_t uid, ms_noti_type_e noti_type);
-int msc_remove_extract_request(const ms_comm_msg_s *recv_msg);
-int msc_set_cancel_extract_item(const char* path, int pid);
+void msc_remove_extract_request(const ms_comm_msg_s *recv_msg);
+void msc_set_cancel_extract_item(const char* path, int pid);
 void msc_set_extract_blocked_path(const char *blocked_path);
 void msc_send_power_off_request_to_extractor(void);
 void msc_remove_folder_extract_request(ms_comm_msg_s *recv_msg);

diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c
index b028685..0507837 100644 (file)
--- a/src/scanner-v2/media-scanner-extract-v2.c
+++ b/src/scanner-v2/media-scanner-extract-v2.c
@@ -380,12 +380,15 @@ void msc_insert_exactor_request(ms_msg_type_e msg_type, bool ins_status, const c
        }
 }
 
-int msc_remove_extract_request(const ms_comm_msg_s *recv_msg)
+void msc_remove_extract_request(const ms_comm_msg_s *recv_msg)
 {
        int items_to_find = 0;
        ms_comm_msg_s *msg = NULL;
 
-       MS_DBG_RETVM_IF(!recv_msg, MS_MEDIA_ERR_INVALID_PARAMETER, "recv_msg is null");
+       if (!recv_msg) {
+               MS_DBG_ERR("recv_msg is null");
+               return;
+       }
 
        g_mutex_lock(&extract_req_mutex);
        MS_DBG_WARN("extract_req_mutex is LOCKED");
@@ -409,15 +412,12 @@ int msc_remove_extract_request(const ms_comm_msg_s *recv_msg)
        g_mutex_unlock(&extract_req_mutex);
        MS_DBG_WARN("extract_req_mutex is UNLOCKED");
        __msc_del_extract_blocked_path(recv_msg->msg);
-
-       return MS_MEDIA_ERR_NONE;
 }
 
-static int __msc_set_extract_item(s_extract_item** item, const char* path, int pid)
+static void __msc_set_extract_item(s_extract_item** item, const char* path, int pid)
 {
        s_extract_item* extract_item = *item;
 
-
        if (!extract_item)
                extract_item = g_new0(s_extract_item, 1);
 
@@ -429,8 +429,6 @@ static int __msc_set_extract_item(s_extract_item** item, const char* path, int p
        *item = extract_item;
 
        MS_DBG_SWARN("__msc_set_extract_item path[%s],pid[%d]", extract_item->path, extract_item->pid);
-
-       return MS_MEDIA_ERR_NONE;
 }
 
 static void __msc_del_extract_item(s_extract_item** item)
@@ -442,26 +440,26 @@ static void __msc_del_extract_item(s_extract_item** item)
        }
 }
 
-int msc_set_cancel_extract_item(const char* cancel_path, int pid)
+void msc_set_cancel_extract_item(const char* cancel_path, int pid)
 {
-       int ret = -1;
        MS_DBG_WARN("msc_set_cancel_extract_item begin");
-       g_mutex_lock(&extract_item_mutex);
-       if (cancel_path == NULL) {
-               MS_DBG_ERR("cancel_path invalid...");
-               return ret;
+
+       if (!cancel_path) {
+               MS_DBG_ERR("cancel_path invalid");
+               return;
        }
 
+       g_mutex_lock(&extract_item_mutex);
+
        if (cur_extract_item && cur_extract_item->path) {
                if ((strcmp(cur_extract_item->path, cancel_path) == 0) && (pid == cur_extract_item->pid))
-                       ret = __msc_set_extract_item(&cancel_extract_item, cancel_path, pid);
+                       __msc_set_extract_item(&cancel_extract_item, cancel_path, pid);
                else if ((pid == -1) && (strncmp(cur_extract_item->path, cancel_path, strlen(cancel_path)) == 0))
-                       ret = __msc_set_extract_item(&cancel_extract_item, cancel_path, pid);
+                       __msc_set_extract_item(&cancel_extract_item, cancel_path, pid);
        }
        g_mutex_unlock(&extract_item_mutex);
 
        MS_DBG_WARN("msc_set_cancel_extract_item end");
-       return ret;
 }
 
 static void __msc_del_cancel_extract_item(void)