Apply Werror option and fix warning code

Change-Id: I6fb8a115ff646eef21d6fffedf6c66465df42a20

diff --git a/CMakeLists.txt b/CMakeLists.txt
index baef27d..2f8d8f6 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ FOREACH(flag ${${fw_name}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 
 IF("${ARCH}" STREQUAL "arm")

diff --git a/include/media_info_private.h b/include/media_info_private.h
index 49038e3..e5d280a 100755 (executable)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -644,6 +644,7 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou
 int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb callback, void *user_data, group_list_e group_type);
 int _media_db_get_group_item(const char *group_name, filter_h filter, media_info_cb callback, void *user_data, group_list_e group_type);
 int _media_db_get_media_group_item_count(const char *group_name, filter_h filter, media_group_e group, int *item_count);
+int _media_db_get_media_group_item(const char *group_name, filter_h filter, media_group_e group, media_info_cb callback, void *user_data);
 int _media_db_get_storage_id_by_media_id(const char *media_id, char *storage_id);
 
 /**

diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec
index 275f851..dd6c7d2 100755 (executable)
--- a/packaging/capi-content-media-content.spec
+++ b/packaging/capi-content-media-content.spec
@@ -1,6 +1,6 @@
 Name:       capi-content-media-content
 Summary:    A Media content library in SLP C API
-Version:    0.2.63
+Version:    0.2.64
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_filter.c b/src/media_filter.c
index 4bcaa30..7725569 100755 (executable)
--- a/src/media_filter.c
+++ b/src/media_filter.c
@@ -54,9 +54,11 @@ static int __tokenize(GList **token_list, const char *str);
 
 static bool __is_pinyin_needed(void)
 {
+#if 0
        char *lang = NULL;
        char *china = "zh_CN";
        char *hongkong = "zh_HK";
+#endif
        int ret = FALSE;
 #if 0
        /*Check CSC first*/

diff --git a/src/media_info.c b/src/media_info.c
index 8135acd..5425344 100755 (executable)
--- a/src/media_info.c
+++ b/src/media_info.c
@@ -3212,89 +3212,6 @@ int media_info_cancel_thumbnail(media_info_h media)
        return ret;
 }
 
-static int __media_info_map_data_usr_to_svc(media_info_s *media, media_svc_content_info_s **service_content, media_content_storage_e storage_type)
-{
-       if(media == NULL)
-       {
-               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       media_svc_content_info_s *svc_content_info = calloc(1, sizeof(media_svc_content_info_s));
-       if(svc_content_info == NULL)
-       {
-               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-       }
-
-       svc_content_info->path = g_strdup(media->file_path);
-       svc_content_info->media_type = media->media_type;
-       svc_content_info->mime_type = g_strdup(media->mime_type);
-       svc_content_info->size = media->size;
-       svc_content_info->storage_type = storage_type;
-       svc_content_info->storage_uuid = g_strdup(media->storage_uuid);
-
-       svc_content_info->added_time = media->added_time;
-       svc_content_info->modified_time = media->modified_time;
-       svc_content_info->thumbnail_path = g_strdup(media->thumbnail_path);
-       svc_content_info->is_drm = media->is_drm;
-
-       svc_content_info->media_meta.title = g_strdup(media->title);
-       svc_content_info->media_meta.rating = media->rating;
-       svc_content_info->media_meta.description = g_strdup(media->description);
-       svc_content_info->media_meta.longitude = media->longitude;
-       svc_content_info->media_meta.latitude = media->latitude;
-       svc_content_info->media_meta.altitude = media->altitude;
-       svc_content_info->media_meta.weather = g_strdup(media->weather);
-
-       switch(media->media_type)
-       {
-               case MEDIA_CONTENT_TYPE_IMAGE:
-                       svc_content_info->media_meta.width = media->image_meta->width;
-                       svc_content_info->media_meta.height = media->image_meta->height;
-                       svc_content_info->media_meta.datetaken = g_strdup(media->image_meta->date_taken);
-                       svc_content_info->media_meta.orientation = media->image_meta->orientation;
-                       break;
-               case MEDIA_CONTENT_TYPE_VIDEO:
-                       svc_content_info->media_meta.album = g_strdup(media->audio_meta->album);
-                       svc_content_info->media_meta.artist = g_strdup(media->audio_meta->artist);
-                       svc_content_info->media_meta.album_artist = g_strdup(media->audio_meta->album_artist);
-                       svc_content_info->media_meta.genre = g_strdup(media->audio_meta->genre);
-                       svc_content_info->media_meta.composer = g_strdup(media->audio_meta->composer);
-                       svc_content_info->media_meta.year = g_strdup(media->audio_meta->year);
-                       svc_content_info->media_meta.recorded_date = g_strdup(media->audio_meta->recorded_date);
-                       svc_content_info->media_meta.copyright = g_strdup(media->audio_meta->copyright);
-                       svc_content_info->media_meta.track_num = g_strdup(media->audio_meta->track_num);
-                       svc_content_info->media_meta.bitrate = media->audio_meta->bitrate;
-                       svc_content_info->media_meta.duration = media->audio_meta->duration;
-                       svc_content_info->media_meta.width = media->image_meta->width;
-                       svc_content_info->media_meta.height = media->image_meta->height;
-                       break;
-               case MEDIA_CONTENT_TYPE_SOUND:
-               case MEDIA_CONTENT_TYPE_MUSIC:
-                       svc_content_info->media_meta.album = g_strdup(media->audio_meta->album);
-                       svc_content_info->media_meta.artist = g_strdup(media->audio_meta->artist);
-                       svc_content_info->media_meta.album_artist = g_strdup(media->audio_meta->album_artist);
-                       svc_content_info->media_meta.genre = g_strdup(media->audio_meta->genre);
-                       svc_content_info->media_meta.composer = g_strdup(media->audio_meta->composer);
-                       svc_content_info->media_meta.year = g_strdup(media->audio_meta->year);
-                       svc_content_info->media_meta.recorded_date = g_strdup(media->audio_meta->recorded_date);
-                       svc_content_info->media_meta.copyright = g_strdup(media->audio_meta->copyright);
-                       svc_content_info->media_meta.track_num = g_strdup(media->audio_meta->track_num);
-                       svc_content_info->media_meta.bitrate = media->audio_meta->bitrate;
-                       svc_content_info->media_meta.duration = media->audio_meta->duration;
-                       svc_content_info->media_meta.channel = media->audio_meta->channel;
-                       svc_content_info->media_meta.samplerate = media->audio_meta->samplerate;
-                       break;
-               case MEDIA_CONTENT_TYPE_OTHERS:
-               default:
-                       break;
-       }
-
-       *service_content = svc_content_info;
-       return MEDIA_CONTENT_ERROR_NONE;
-}
-
 static int __media_info_set_str_data(media_info_h media, media_info_item_e data_type, const char *str_data)
 {
        media_info_s *_media = (media_info_s*)media;

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index efefc2b..af466da 100755 (executable)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,7 +7,7 @@ FOREACH(flag ${${fw_test}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -pie")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -pie -Werror")
 
 aux_source_directory(. sources)
 FOREACH(src ${sources})

diff --git a/test/media-content_test.c b/test/media-content_test.c
index c971cec..ac57f86 100755 (executable)
--- a/test/media-content_test.c
+++ b/test/media-content_test.c
@@ -2052,7 +2052,7 @@ int test_bookmark_operation(void)
                media_content_error("error media_filter_set_order : [%d]", ret);
 
        //insert bookmark to video
-       char *thumbnail_path1 = tzplatform_mkpath(TZ_USER_CONTENT, "Images and videos/My video clips/teat11.jpg");
+       const char *thumbnail_path1 = tzplatform_mkpath(TZ_USER_CONTENT, "Images and videos/My video clips/teat11.jpg");
        ret = media_bookmark_insert_to_db(test_video_id, 400, thumbnail_path1);
        if(ret != MEDIA_CONTENT_ERROR_NONE)
                media_content_error("error media_bookmark_insert_to_db : [%d]", ret);
@@ -2314,7 +2314,7 @@ int test_move(void)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
        const char *move_media_id = "60aea677-4742-408e-b5f7-f2628062d06d";
-       char *dst_path = tzplatform_mkpath(TZ_USER_CONTENT, "Images/XX/Default1.jpg");
+       const char *dst_path = tzplatform_mkpath(TZ_USER_CONTENT, "Images/XX/Default1.jpg");
        media_info_h move_media = NULL;
 
        ret = media_info_get_media_from_db(move_media_id, &move_media);
@@ -2991,7 +2991,7 @@ gboolean _send_noti_operations(gpointer data)
 
        /* media_info_insert_to_db */
        media_info_h media_item = NULL;
-       char *path = tzplatform_mkpath(TZ_USER_CONTENT, "test/image1.jpg");
+       const char *path = tzplatform_mkpath(TZ_USER_CONTENT, "test/image1.jpg");
 
        ret = media_info_insert_to_db(path, &media_item);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {