Fix build warning 76/62376/1
authorMinje Ahn <minje.ahn@samsung.com>
Wed, 16 Mar 2016 00:21:05 +0000 (09:21 +0900)
committerMinje Ahn <minje.ahn@samsung.com>
Wed, 16 Mar 2016 00:21:05 +0000 (09:21 +0900)
Change-Id: I7a6da15b2f56d436a3fed7da79f4da30e0a18e5d
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
lib/media-util-dcm.c
src/server/media-server-dcm.c
src/server/media-server-device-block.c

index 9b5abd2..a29cc33 100755 (executable)
@@ -20,6 +20,7 @@
  */
 
 #include <glib.h>
+#include <unistd.h>
 #include <media-server-ipc.h>
 #include <media-util-dbg.h>
 #include <media-util-dcm.h>
index b37f36f..d909508 100755 (executable)
@@ -154,8 +154,6 @@ gboolean _ms_dcm_agent_recv_msg_from_server()
        struct sockaddr_un serv_addr;
        unsigned int serv_addr_len;
 
-       struct timeval tv_timeout = { 0, 500000 };
-
        int sockfd = -1;
        int retry = 10;
        MS_DBG("_ms_dcm_agent_recv_msg_from_server in");
index 707e411..da0695f 100755 (executable)
@@ -61,10 +61,12 @@ int ms_usb_insert_handler(const char *mount_path, const char *mount_uuid)
        int ret = MS_MEDIA_ERR_NONE;
        char *storage_path = NULL;
        void **handle = NULL;
+       char *uuid = NULL;
        int validity = 0;
        uid_t uid;
        ms_dir_scan_type_t scan_type = MS_SCAN_ALL;
 
+       uuid = strndup(mount_uuid, strlen(mount_uuid));
        ret = ms_load_functions();
        if (ret != MS_MEDIA_ERR_NONE) {
                MS_DBG_ERR("ms_load_functions failed [%d]", ret);
@@ -97,7 +99,7 @@ int ms_usb_insert_handler(const char *mount_path, const char *mount_uuid)
                        }
                        scan_type = MS_SCAN_PART;
                        ms_set_storage_validity(handle, mount_uuid, 1, uid);
-                       if (ms_set_storage_scan_status(handle, mount_uuid, MEDIA_SCAN_PREPARE, uid) != MS_MEDIA_ERR_NONE) {
+                       if (ms_set_storage_scan_status(handle, uuid, MEDIA_SCAN_PREPARE, uid) != MS_MEDIA_ERR_NONE) {
                                MS_DBG_ERR("ms_set_storage_scan_status failed");
                        }
                } else {
@@ -115,6 +117,7 @@ int ms_usb_insert_handler(const char *mount_path, const char *mount_uuid)
 
 ERROR:
        MS_SAFE_FREE(storage_path);
+       MS_SAFE_FREE(uuid);
 
        ms_disconnect_db(&handle);