Remove unused functions in scanner-v2

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

diff --git a/src/scanner-v2/include/media-scanner-extract-v2.h b/src/scanner-v2/include/media-scanner-extract-v2.h
index 4a381da..78857a6 100755 (executable)
--- a/src/scanner-v2/include/media-scanner-extract-v2.h
+++ b/src/scanner-v2/include/media-scanner-extract-v2.h
@@ -42,8 +42,5 @@ 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_set_extract_blocked_path(const char *blocked_path);
 int msc_push_extract_request(ms_extract_type_e scan_type, ms_comm_msg_s *recv_msg);
-void msc_stop_extract_thread(void);
-int msc_get_remain_extract_request(ms_extract_type_e scan_type, int *remain_request);
-int msc_set_extract_cancel_path(const char *cancel_path);
 
 #endif /*_MEDIA_SCANNER_EXTRACT_V2_H_*/

diff --git a/src/scanner-v2/media-scanner-common-v2.c b/src/scanner-v2/media-scanner-common-v2.c
index 287c93f..b3347bf 100755 (executable)
--- a/src/scanner-v2/media-scanner-common-v2.c
+++ b/src/scanner-v2/media-scanner-common-v2.c
@@ -18,9 +18,7 @@
  * limitations under the License.
  *
  */
-#include "media-util-err.h"
 
-#include "media-scanner-dbg-v2.h"
 #include "media-scanner-common-v2.h"
 
 bool power_off2;

diff --git a/src/scanner-v2/media-scanner-db-manage-v2.c b/src/scanner-v2/media-scanner-db-manage-v2.c
index 4ba3fc7..4731311 100755 (executable)
--- a/src/scanner-v2/media-scanner-db-manage-v2.c
+++ b/src/scanner-v2/media-scanner-db-manage-v2.c
@@ -34,14 +34,12 @@ int msc_check_db_size(uid_t uid, int scan_type)
 
        ms_check_size_mediadb(uid, &db_size);
 
-       if (scan_type == MS_MSG_STORAGE_ALL
-               || scan_type == MS_MSG_STORAGE_PARTIAL) {
+       if (scan_type == MS_MSG_STORAGE_ALL || scan_type == MS_MSG_STORAGE_PARTIAL) {
                if (db_size >= MEDIA_DB_SIZE_LIMIT_1) {
                        MS_DBG_ERR("DB SIZE [%lf] reach the MEDIA_DB_SIZE_LIMIT_1[%lf]", db_size, MEDIA_DB_SIZE_LIMIT_1);
                        return MS_MEDIA_ERR_DB_LIMIT_1;
                }
-       } else if (scan_type == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE
-               || scan_type == MS_MSG_DIRECTORY_SCANNING) {
+       } else if (scan_type == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE || scan_type == MS_MSG_DIRECTORY_SCANNING) {
                if (db_size >= MEDIA_DB_SIZE_LIMIT_2) {
                        MS_DBG_ERR("DB SIZE [%lf] reach the MEDIA_DB_SIZE_LIMIT_2[%lf]", db_size, MEDIA_DB_SIZE_LIMIT_2);
 

diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c
index 96041aa..ddd0762 100644 (file)
--- a/src/scanner-v2/media-scanner-extract-v2.c
+++ b/src/scanner-v2/media-scanner-extract-v2.c
@@ -46,7 +46,6 @@ GAsyncQueue *storage_extract_queue;
 GAsyncQueue *folder_extract_queue;
 static GMutex extract_req_mutex;
 static GMutex extract_blocked_mutex;
-static char *g_extract_cancel_path;
 static char *g_extract_blocked_path;
 bool g_directory_extract_processing;
 static int stg_extract_status;
@@ -80,8 +79,6 @@ typedef struct {
        char *path;
 } ms_item_info_s;
 
-static int __msc_folder_bulk_extract(sqlite3 *handle, const char* storage_id, int storage_type, const char *path, int scan_type, int pid, uid_t uid, unsigned int *io_err_count, bool is_end);
-
 void msc_init_extract_thread(void)
 {
        if (!storage_extract_queue) storage_extract_queue = g_async_queue_new();
@@ -112,7 +109,7 @@ void msc_deinit_extract_thread(void)
        g_cond_clear(&extract_data_cond);
 }
 
-int __msc_folder_bulk_extract(sqlite3 *handle, const char* storage_id, int storage_type, const char *path, int scan_type, int pid, uid_t uid, unsigned int *io_err_count, bool is_end)
+static int __msc_folder_bulk_extract(sqlite3 *handle, const char *storage_id, int storage_type, const char *path, int scan_type, int pid, uid_t uid, bool is_end)
 {
        MS_DBG_WARN("begin of __msc_folder_bulk_extract");
        int ret = MS_MEDIA_ERR_NONE;
@@ -122,16 +119,9 @@ int __msc_folder_bulk_extract(sqlite3 *handle, const char* storage_id, int stora
        int extract_count = 0;
        int sleep_count = 0;
 
-       ret = ms_get_extract_list(handle, storage_id, storage_type, scan_type, path, is_end, uid, (void*)&data_array);
-       if (ret != MS_MEDIA_ERR_NONE) {
-               MS_DBG_ERR("ms_get_extract_list failed!!!");
-               return MS_MEDIA_ERR_NONE;
-       }
-
-       if (data_array == NULL) {
-               MS_DBG_ERR("data_array is NULL!!!");
-               return MS_MEDIA_ERR_NONE;
-       }
+       ret = ms_get_extract_list(handle, storage_id, storage_type, scan_type, path, is_end, uid, (void *)&data_array);
+       MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, MS_MEDIA_ERR_NONE, "ms_get_extract_list failed!!!");
+       MS_DBG_RETVM_IF(!data_array, MS_MEDIA_ERR_NONE, "data_array is NULL!!!");
 
        while (data_array->len != 0) {
                tmp_ret = MS_MEDIA_ERR_NONE;
@@ -151,18 +141,16 @@ int __msc_folder_bulk_extract(sqlite3 *handle, const char* storage_id, int stora
                g_mutex_unlock(&decode_mutex);
                if (tmp_ret == MS_MEDIA_ERR_NONE)
                        extract_count++;
-               else if (tmp_ret == MS_MEDIA_ERR_INTERNAL)
-                       (*io_err_count)++;
 
                if (db_data) {
                        MS_SAFE_FREE(db_data->path);
                        MS_SAFE_FREE(db_data);
                        db_data = NULL;
                }
-               sleep_count++;
-               if (sleep_count % 5 == 0) {
+
+               if (++sleep_count == 5) {
                        sleep_count = 0;
-               usleep(SCAN_SLEEP_TIME);
+                       usleep(SCAN_SLEEP_TIME);
                }
        }
 
@@ -171,7 +159,7 @@ int __msc_folder_bulk_extract(sqlite3 *handle, const char* storage_id, int stora
 
        while (data_array->len != 0) {
                db_data = NULL;
-               db_data = g_array_index(data_array, ms_item_info_s*, 0);
+               db_data = g_array_index(data_array, ms_item_info_s *, 0);
                g_array_remove_index(data_array, 0);
 
                if (db_data) {
@@ -196,7 +184,6 @@ gpointer msc_folder_extract_thread(gpointer data)
        ms_user_storage_type_e storage_type;
        char *storage_id = NULL;
        char *update_path = NULL;
-       unsigned int io_err_count = 0;
        uid_t uid = MEDIA_DEFAULT_UID;
        int end_flag = NORMAL_EVENT;
        ms_noti_type_e noti_type = MS_ITEM_INSERT;
@@ -210,8 +197,6 @@ gpointer msc_folder_extract_thread(gpointer data)
 
                MS_DBG_WARN("DIRECTORY EXTRACT START [%.*s %d]", MAX_MSG_SIZE, extract_data->msg, extract_data->msg_type);
 
-               io_err_count = 0;
-
                __msc_set_cur_extract_item(extract_data->msg, extract_data->pid);
                g_directory_extract_processing = true;
                uid = extract_data->uid;
@@ -274,7 +259,7 @@ gpointer msc_folder_extract_thread(gpointer data)
                        goto NEXT;
                }
 
-               ret = __msc_folder_bulk_extract(handle, extract_data->storage_id, storage_type, update_path, scan_type, extract_data->pid, uid, &io_err_count, end_flag);
+               ret = __msc_folder_bulk_extract(handle, extract_data->storage_id, storage_type, update_path, scan_type, extract_data->pid, uid, end_flag);
 
 NEXT:
                g_directory_extract_processing = false;
@@ -347,7 +332,6 @@ gpointer msc_storage_extract_thread(gpointer data)
        ms_user_storage_type_e storage_type = MS_USER_STORAGE_INTERNAL;
        int scan_type;
        char *update_path = NULL;
-       unsigned int io_err_count = 0;
        uid_t uid = MEDIA_DEFAULT_UID;
        int end_flag = NORMAL_EVENT;
        int tem_ret = MS_MEDIA_ERR_NONE;
@@ -362,8 +346,6 @@ gpointer msc_storage_extract_thread(gpointer data)
 
                __msc_set_storage_extract_status(MS_STORAGE_SCAN_META_PROCESSING);
 
-               io_err_count = 0;
-
                MS_DBG_WARN("STORAGE extract START extract len is %d ", g_async_queue_length(storage_extract_queue));
 
                scan_type = extract_data->msg_type;
@@ -416,7 +398,7 @@ gpointer msc_storage_extract_thread(gpointer data)
                }
 
                /*extract meta*/
-               ret = __msc_folder_bulk_extract(handle, extract_data->storage_id, storage_type, update_path, scan_type, extract_data->pid, uid, &io_err_count, end_flag);
+               ret = __msc_folder_bulk_extract(handle, extract_data->storage_id, storage_type, update_path, scan_type, extract_data->pid, uid, end_flag);
                MS_DBG_WARN("extract PAUSE");
                __msc_pause_extract();
                MS_DBG_WARN("extract RESUME");
@@ -779,56 +761,3 @@ static int __msc_extract_set_db_status(ms_db_status_type_t status)
        return res;
 }
 
-int msc_get_remain_extract_request(ms_extract_type_e scan_type, int *remain_request)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-
-       switch (scan_type) {
-       case MS_EXTRACT_STORAGE:
-               *remain_request = g_async_queue_length(storage_extract_queue);
-               break;
-       case MS_EXTRACT_DIRECTORY:
-               *remain_request = g_async_queue_length(folder_extract_queue);
-               break;
-       default:
-               MS_DBG_ERR("invalid parameter");
-               ret = MS_MEDIA_ERR_INVALID_PARAMETER;
-               break;
-       }
-
-       return ret;
-}
-
-void msc_stop_extract_thread(void)
-{
-       ms_comm_msg_s *data = NULL;
-
-       if (storage_extract_queue) {
-               /*notify to storage extract thread*/
-               data = g_new0(ms_comm_msg_s, 1);
-
-               data->pid = POWEROFF;
-               g_async_queue_push(storage_extract_queue, data);
-       }
-
-       if (folder_extract_queue) {
-               /*notify to folder extract thread*/
-               data = g_new0(ms_comm_msg_s, 1);
-
-               data->pid = POWEROFF;
-               g_async_queue_push(folder_extract_queue, data);
-       }
-}
-
-int msc_set_extract_cancel_path(const char *cancel_path)
-{
-       if (g_extract_cancel_path != NULL) {
-               MS_DBG_WARN("g_extract_cancel_path is not NULL");
-               g_free(g_extract_cancel_path);
-       }
-
-       g_extract_cancel_path = g_strdup(cancel_path);
-
-       return MS_MEDIA_ERR_NONE;
-}
-