Minor changes

Change-Id: If847e5bbf9fe4ab19072cb0b439f90b685ddf309

diff --git a/lib/media-util-register.c b/lib/media-util-register.c
index ca63c44..220576c 100644 (file)
--- a/lib/media-util-register.c
+++ b/lib/media-util-register.c
@@ -239,7 +239,7 @@ static int __media_db_request_update_async(ms_msg_type_e msg_type,
 
        MSAPI_RETVM_IF(!ms_ipc_is_valid_msg(request_msg), MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid request_msg");
 
-       MSAPI_DBG("REQUEST UPDATE ASYNC [%d][%s]", msg_type, request_msg);
+       MSAPI_DBG_SLOG("REQUEST UPDATE ASYNC [%d][%s]", msg_type, request_msg);
 
        request_msg_size = strlen(request_msg);
        if (request_msg[request_msg_size - 1] == '/') {
@@ -249,7 +249,7 @@ static int __media_db_request_update_async(ms_msg_type_e msg_type,
                request_path = g_strdup(request_msg);
        }
 
-       MSAPI_DBG("querysize[%d] path[%s] query[%s]", request_msg_size, request_msg, request_path);
+       MSAPI_DBG_SLOG("querysize[%d] path[%s] query[%s]", request_msg_size, request_msg, request_path);
 
        memset((void *)&send_msg, 0, sizeof(ms_comm_msg_s));
        send_msg.msg_type = msg_type;

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 605bff4..993fa96 100644 (file)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -226,7 +226,7 @@ static int __msc_dir_scan_for_folder(sqlite3 *handle, const char *storage_id, ch
                ms_batch_commit_disable(uid);
                ms_batch_commit_enable(false, pid);
 
-               current_path = g_ptr_array_index(dir_array , 0);
+               current_path = g_ptr_array_index(dir_array, 0);
                g_ptr_array_remove_index(dir_array, 0);
 
                __msc_set_dir_scan_cur_path(current_path);
@@ -390,7 +390,7 @@ static int __msc_dir_scan_for_storage(sqlite3 *handle, const char *storage_id, c
        int ret = MS_MEDIA_ERR_NONE;
        char *new_path = NULL;
        char *current_path = NULL;
-       char path[MS_FILE_PATH_LEN_MAX] = { 0 };
+       char path[MS_FILE_PATH_LEN_MAX] = {0, };
        int (*scan_function)(sqlite3 *, const char*, const char*, uid_t) = NULL;
        char *new_start_path = NULL;
 
@@ -436,9 +436,8 @@ static int __msc_dir_scan_for_storage(sqlite3 *handle, const char *storage_id, c
                        MS_SAFE_FREE(current_path);
                        if (ret == MS_MEDIA_ERR_USB_UNMOUNTED)
                                goto STOP_SCAN;
-                       else
-                               ret = MS_MEDIA_ERR_NONE;
 
+                       ret = MS_MEDIA_ERR_NONE;
                        continue;
                }
 
@@ -1003,8 +1002,8 @@ static void __msc_check_pvr_svc(void)
 
 gpointer msc_storage_scan_thread(gpointer data)
 {
-       ms_comm_msg_s *scan_data = NULL;
        int ret = MS_MEDIA_ERR_NONE;
+       ms_comm_msg_s *scan_data = NULL;
        sqlite3 *handle = NULL;
        ms_user_storage_type_e storage_type = MS_USER_STORAGE_INTERNAL;
 
@@ -1015,7 +1014,7 @@ gpointer msc_storage_scan_thread(gpointer data)
                        goto _POWEROFF;
                }
 
-               MS_DBG_WARN("STORAGE SCAN START [%.*s]", MAX_MSG_SIZE, scan_data->msg);
+               MS_DBG_WARN("STORAGE SCAN START [%.*s][%s]", MAX_MSG_SIZE, scan_data->msg, scan_data->storage_id);
 
                if (scan_data->msg_type != MS_MSG_STORAGE_ALL &&
                        scan_data->msg_type != MS_MSG_STORAGE_PARTIAL &&

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index 9e8dcf7..928ce6a 100644 (file)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -215,7 +215,7 @@ static int __msc_directory_scan_update_and_delete(sqlite3 *handle, ms_comm_msg_s
        MS_DBG_RETVM_IF(!scan_data, MS_MEDIA_ERR_INVALID_PARAMETER, "scan_data is NULL");
 
        ret = ms_set_folder_validity(handle, scan_data->storage_id, scan_data->msg, MS_SCANNING, is_recursive, scan_data->uid);
-       MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "set_folder_validity failed");
+       MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "ms_set_folder_validity failed");
 
        ret = ms_set_folder_item_validity(handle, scan_data->storage_id, scan_data->msg, MS_SCANNING, is_recursive, scan_data->uid);
        MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "ms_set_folder_item_validity failed");
@@ -380,7 +380,7 @@ gpointer msc_storage_scan_thread(gpointer data)
        while (1) {
                scan_data = g_async_queue_pop(storage_queue);
                if (scan_data->pid == POWEROFF) {
-                       MS_DBG_WARN("power off");
+                       MS_DBG_ERR("power off");
                        goto _POWEROFF;
                }
 

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index 1ba996d..cce9ee6 100644 (file)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -344,16 +344,16 @@ int main(int argc, char **argv)
        if (ms_ipc_create_server_socket(MS_SCANNER_PORT, &sockfd) != MS_MEDIA_ERR_NONE) {
                MS_DBG_ERR("Failed to create socket");
                return -1;
-       } else {
-               if (ms_cynara_enable_credentials_passing(sockfd) != MS_MEDIA_ERR_NONE)
-                       MS_DBG_ERR("Failed to setup credential passing");
-
-               channel = g_io_channel_unix_new(sockfd);
-               g_io_channel_set_close_on_unref(channel, TRUE);
-               main_source_id = g_io_add_watch(channel, G_IO_IN, ms_read_socket, NULL);
-               g_io_channel_unref(channel);
        }
 
+       if (ms_cynara_enable_credentials_passing(sockfd) != MS_MEDIA_ERR_NONE)
+               MS_DBG_ERR("Failed to setup credential passing");
+
+       channel = g_io_channel_unix_new(sockfd);
+       g_io_channel_set_close_on_unref(channel, TRUE);
+       main_source_id = g_io_add_watch(channel, G_IO_IN, ms_read_socket, NULL);
+       g_io_channel_unref(channel);
+
        /* recevie event from other modules */
        __ms_add_event_receiver();