Fix build warning

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

diff --git a/include/media-svc.h b/include/media-svc.h
index 14f1f73..237c245 100755 (executable)
--- a/include/media-svc.h
+++ b/include/media-svc.h
@@ -97,7 +97,7 @@ int media_svc_insert_folder_end(uid_t uid);
 int media_svc_get_folder_scan_status(MediaSvcHandle *handle, const char *storage_id, const char *path, int *storage_status);
 int media_svc_set_folder_scan_status(const char *storage_id, const char *path, int storage_status, uid_t uid);
 int media_svc_get_folder_modified_time(MediaSvcHandle *handle, const char *path, const char *storage_id, bool *modified);
-int media_svc_get_null_scan_folder_list(MediaSvcHandle *handle, char *storage_id, char* folder_path, char ***folder_list, int *count);
+int media_svc_get_null_scan_folder_list(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, char ***folder_list, int *count);
 int media_svc_change_validity_item_batch(const char *storage_id, const char *path, int des_validity, int src_validity, uid_t uid);
 int media_svc_delete_invalid_folder_by_path(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, uid_t uid, int *delete_count);
 int media_svc_check_folder_exist_by_path(MediaSvcHandle *handle, const char *storage_id, const char *folder_path);

diff --git a/md5/md5.c b/md5/md5.c
index fed42c8..4ff36e5 100755 (executable)
--- a/md5/md5.c
+++ b/md5/md5.c
@@ -143,8 +143,7 @@ void MD5Final(unsigned char digest[16], MD5_CTX *ctx)
        byteReverse(ctx->in, 14);
 
        /* Append length in bits and transform */
-       ((uint32_t *) ctx->in)[14] = ctx->bits[0];
-       ((uint32_t *) ctx->in)[15] = ctx->bits[1];
+       memcpy(((uint32_t *) ctx->in)+14, ctx->bits, sizeof(uint32_t)*2);
 
        MD5Transform(ctx->buf, (uint32_t *) ctx->in);
        byteReverse((unsigned char *)ctx->buf, 4);

diff --git a/src/common/media-svc-media-folder.c b/src/common/media-svc-media-folder.c
index 135a379..29f9753 100755 (executable)
--- a/src/common/media-svc-media-folder.c
+++ b/src/common/media-svc-media-folder.c
@@ -689,7 +689,7 @@ int _media_svc_get_folder_modified_time_by_path(sqlite3 *handle, const char *pat
        return ret;
 }
 
-int _media_svc_get_null_scan_folder_list(sqlite3 *handle, char *storage_id, char *path, char ***folder_list, int *count)
+int _media_svc_get_null_scan_folder_list(sqlite3 *handle, const char *storage_id, const char *path, char ***folder_list, int *count)
 {
        int ret = MS_MEDIA_ERR_NONE;
        int idx = 0;

diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c
index 546803e..52e3a5e 100755 (executable)
--- a/src/common/media-svc-media.c
+++ b/src/common/media-svc-media.c
@@ -878,7 +878,7 @@ int _media_svc_append_query_list(const char *query, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
 
-       g_media_svc_update_list = g_list_append(g_media_svc_update_list, query);
+       g_media_svc_update_list = g_list_append(g_media_svc_update_list, (gpointer)query);
 
        g_media_svc_update_list_count++;
 

diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c
index 6494346..5a9d02f 100755 (executable)
--- a/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@ -598,10 +598,10 @@ static char *__media_svc_get_thumb_path(uid_t uid)
        return result_passwd;
 }
 
-static int __media_svc_resize_artwork(void *image, int size, const char *img_format, void **resize_image, int *resize_size)
+static int __media_svc_resize_artwork(unsigned char *image, unsigned int size, const char *img_format, unsigned char **resize_image, unsigned int *resize_size)
 {
        int ret = MS_MEDIA_ERR_NONE;
-       void *raw_image = NULL;
+       unsigned char *raw_image = NULL;
        int width = 0;
        int height = 0;
        unsigned int raw_size = 0;
@@ -687,7 +687,7 @@ static int __media_svc_resize_artwork(void *image, int size, const char *img_for
        return ret;
 }
 
-static int _media_svc_save_image(void *image, int size, char *image_path, uid_t uid)
+static int _media_svc_save_image(unsigned char *image, unsigned int size, char *image_path, uid_t uid)
 {
        media_svc_debug("start save image, path [%s] image size [%d]", image_path, size);
 
@@ -1613,8 +1613,8 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
        MMHandleType content = 0;
        MMHandleType tag = 0;
        char *p = NULL;
-       void *image = NULL;
-       int size = -1;
+       unsigned char *image = NULL;
+       unsigned int size = 0;
        int extracted_field = MEDIA_SVC_EXTRACTED_FIELD_NONE;
        int mmf_error = FILEINFO_ERROR_NONE;
        char *err_attr_name = NULL;
@@ -1624,8 +1624,8 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
        int album_id = 0;
        int ret = MS_MEDIA_ERR_NONE;
        int cdis_value = 0;
-       int resize_size = -1;
-       void *resize_image = NULL;
+       unsigned int resize_size = 0;
+       unsigned char *resize_image = NULL;
 
        /*Get Content Tag attribute ===========*/
        mmf_error = mm_file_create_tag_attrs(&tag, content_info->path);

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index 0b29fac..e00d8b0 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -1197,14 +1197,15 @@ int media_svc_send_dir_update_noti(MediaSvcHandle *handle, const char *storage_i
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
        if (folder_id != NULL) {
-               uuid = folder_id;
+               uuid = strndup(folder_id, strlen(folder_id));
        } else {
-               uuid = noti_item->media_uuid;
+               uuid = strndup(noti_item->media_uuid, strlen(noti_item->media_uuid));
        }
 
        ret = _media_svc_publish_dir_noti(MS_MEDIA_ITEM_DIRECTORY, MS_MEDIA_ITEM_UPDATE, dir_path, -1, noti_item->media_uuid, NULL, pid);
        ret = _media_svc_publish_dir_noti_v2(MS_MEDIA_ITEM_DIRECTORY, update_type, dir_path, -1, uuid, NULL, pid);
        _media_svc_destroy_noti_item(noti_item);
+       SAFE_FREE(uuid);
 
        return ret;
 }
@@ -2247,7 +2248,7 @@ int media_svc_get_folder_modified_time(MediaSvcHandle *handle, const char *path,
        return ret;
 }
 
-int media_svc_get_null_scan_folder_list(MediaSvcHandle *handle, char *storage_id, char* folder_path, char ***folder_list, int *count)
+int media_svc_get_null_scan_folder_list(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, char ***folder_list, int *count)
 {
        sqlite3 * db_handle = (sqlite3 *)handle;
 

diff --git a/src/include/common/media-svc-media-folder.h b/src/include/common/media-svc-media-folder.h
index 3a48652..328f963 100755 (executable)
--- a/src/include/common/media-svc-media-folder.h
+++ b/src/include/common/media-svc-media-folder.h
@@ -42,7 +42,7 @@ GList ** _media_svc_get_folder_list_ptr(void);
 int _media_svc_get_folder_scan_status(sqlite3 *handle, const char *storage_id, const char *path, int *scan_status);
 int _media_svc_set_folder_scan_status(const char *storage_id, const char *path, int scan_status, uid_t uid);
 int _media_svc_get_folder_modified_time_by_path(sqlite3 *handle, const char *path, const char *storage_id, time_t *modified_time);
-int _media_svc_get_null_scan_folder_list(sqlite3 *handle, char *storage_id, char *path, char ***folder_list, int *count);
+int _media_svc_get_null_scan_folder_list(sqlite3 *handle, const char *storage_id, const char *path, char ***folder_list, int *count);
 int _media_svc_delete_invalid_folder_by_path(sqlite3 *handle, const char *storage_id, const char *folder_path, uid_t uid, int *del_count);
 int _media_svc_count_folder_with_path(sqlite3 *handle, const char *storage_id, const char *path, int *count);
 int _media_svc_count_subfolder_with_path(sqlite3 *handle, const char *storage_id, const char *path, int *count);