From b6a930391779e12348c4b008318ae0b68c1d6503 Mon Sep 17 00:00:00 2001 From: Haejeong Kim Date: Wed, 21 Jun 2017 15:36:57 +0900 Subject: [PATCH] fix invalid format argument types for dlog Change-Id: Ifa46a30cd28642371e3ae9d7ccdd38f2371e10df --- include/media_info_private.h | 20 ++++++++--------- src/media_folder.c | 2 +- src/media_info.c | 2 +- test/media-content_test.c | 53 ++++++++++++++++++++++++++------------------ 4 files changed, 44 insertions(+), 33 deletions(-) diff --git a/include/media_info_private.h b/include/media_info_private.h index 0f03f6b..1cba67c 100755 --- a/include/media_info_private.h +++ b/include/media_info_private.h @@ -796,48 +796,48 @@ int _media_filter_attribute_option_generate(attribute_h attr, filter_h filter, c #define media_content_retv_if(expr, val) do { \ if (expr) { \ - LOGE(FONT_COLOR_RED"[%d]"FONT_COLOR_RESET, media_content_gettid()); \ + LOGE(FONT_COLOR_RED"[%ld]"FONT_COLOR_RESET, media_content_gettid()); \ return (val); \ } \ } while (0) #define media_content_retvm_if(expr, val, fmt, arg...) do { \ if (expr) { \ - LOGE(FONT_COLOR_RED"[%d]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg); \ + LOGE(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg); \ return (val); \ } \ } while (0) #define media_content_warn(fmt, arg...) do { \ - LOGW(FONT_COLOR_GREEN"[%d]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg); \ + LOGW(FONT_COLOR_GREEN"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg); \ } while (0) #define media_content_debug(fmt, arg...) do { \ - LOGD(FONT_COLOR_RESET"[%d]"fmt"", media_content_gettid(), ##arg); \ + LOGD(FONT_COLOR_RESET"[%ld]"fmt"", media_content_gettid(), ##arg); \ } while (0) #define media_content_info(fmt, arg...) do { \ - LOGI(FONT_COLOR_GREEN"[%d]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg); \ + LOGI(FONT_COLOR_GREEN"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg); \ } while (0) #define media_content_error(fmt, arg...) do { \ - LOGE(FONT_COLOR_RED"[%d]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg); \ + LOGE(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg); \ } while (0) #define media_content_debug_func() do { \ - LOGD(FONT_COLOR_RESET"[%d]", media_content_gettid()); \ + LOGD(FONT_COLOR_RESET"[%ld]", media_content_gettid()); \ } while (0) #define media_content_sec_debug(fmt, arg...) do { \ - SECURE_LOGD(FONT_COLOR_CYAN"[%d]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg); \ + SECURE_LOGD(FONT_COLOR_CYAN"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg); \ } while (0) #define media_content_sec_warn(fmt, arg...) do { \ - SECURE_LOGW(FONT_COLOR_RED"[%d]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg); \ + SECURE_LOGW(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg); \ } while (0) #define media_content_sec_error(fmt, arg...) do { \ - SECURE_LOGE(FONT_COLOR_RED"[%d]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg); \ + SECURE_LOGE(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg); \ } while (0) #define ERR_BUF_LENGTH 256 diff --git a/src/media_folder.c b/src/media_folder.c index 32b5442..27f8046 100755 --- a/src/media_folder.c +++ b/src/media_folder.c @@ -380,7 +380,7 @@ int media_folder_get_folder_from_db(const char *folder_id, media_folder_h *folde return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } - media_content_error("folder handle %x", _folder); + media_content_error("folder handle %p", _folder); _folder->folder_id = g_strdup((const char *)sqlite3_column_text(stmt, 0)); diff --git a/src/media_info.c b/src/media_info.c index 7243e43..063d110 100755 --- a/src/media_info.c +++ b/src/media_info.c @@ -3485,7 +3485,7 @@ int media_info_insert_to_db_with_data(media_info_h media) RETRY: ret = _media_info_get_media_info_from_db(media_file_path, media_string_uuid, media); if (ret != MEDIA_CONTENT_ERROR_NONE) { - media_content_error("_media_info_get_media_info_from_db fail", ret); + media_content_error("_media_info_get_media_info_from_db fail [%d]", ret); if (ret == MEDIA_CONTENT_ERROR_DB_FAILED && ret_cnt < 5) { ret_cnt++; media_content_error("RETRY GETTING DATA"); diff --git a/test/media-content_test.c b/test/media-content_test.c index f219a27..df24ad0 100755 --- a/test/media-content_test.c +++ b/test/media-content_test.c @@ -136,7 +136,7 @@ bool get_audio_meta(audio_meta_h audio) ret = audio_meta_get_played_time(audio, &t_value); if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); - media_content_debug("played_time : [%d]", t_value); + media_content_debug("played_time : [%ld]", t_value); ret = audio_meta_get_played_position(audio, &i_value); if (ret != MEDIA_CONTENT_ERROR_NONE) @@ -243,7 +243,7 @@ bool get_video_meta(video_meta_h video) ret = video_meta_get_played_time(video, &t_value); if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); - media_content_debug("played_time : [%d]", t_value); + media_content_debug("played_time : [%ld]", t_value); ret = video_meta_get_played_position(video, &i_value); if (ret != MEDIA_CONTENT_ERROR_NONE) @@ -475,17 +475,17 @@ bool media_item_cb(media_info_h media, void *user_data) ret = media_info_get_added_time(media, &t_value); if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); - media_content_debug("added_time : [%d]", t_value); + media_content_debug("added_time : [%ld]", t_value); ret = media_info_get_modified_time(media, &t_value); if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); - media_content_debug("modified_time : [%d]", t_value); + media_content_debug("modified_time : [%ld]", t_value); ret = media_info_get_timeline(media, &t_value); if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); - media_content_debug("timeline : [%d]", t_value); + media_content_debug("timeline : [%ld]", t_value); ret = media_info_get_rating(media, &i_value); if (ret != MEDIA_CONTENT_ERROR_NONE) @@ -767,7 +767,7 @@ bool bookmarks_cb(media_bookmark_h bookmark, void *user_data) if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_bookmark_get_marked_time : [%d]", ret); else - media_content_debug("bookmark marked_time : %d", time); + media_content_debug("bookmark marked_time : %ld", time); ret = media_bookmark_get_name(bookmark, &name); if (ret != MEDIA_CONTENT_ERROR_NONE) @@ -1145,7 +1145,7 @@ int test_gallery_scenario(void) media_content_error("error video_meta_get_played_time : [%d]", ret); media_content_debug("This is Video"); - media_content_debug("Title: %s, Album: %s, Artist: %s, Album_artist: %s \n Duration: %d, Played time: %d", title, album, artist, album_artist, duration, time_played); + media_content_debug("Title: %s, Album: %s, Artist: %s, Album_artist: %s \n Duration: %d, Played time: %ld", title, album, artist, album_artist, duration, time_played); } SAFE_FREE(title); @@ -1192,7 +1192,7 @@ int test_gallery_scenario(void) media_content_error("media_folder_foreach_media_from_db failed: %d", ret); return -1; } else { - media_content_error("media_folder_foreach_media_from_db success!", ret); + media_content_error("media_folder_foreach_media_from_db success!"); char *media_id = NULL; char *media_name = NULL; char *media_path = NULL; @@ -1278,7 +1278,7 @@ int test_gallery_scenario(void) media_content_error("error video_meta_get_played_time : [%d]", ret); media_content_debug("This is Video"); - media_content_debug("Title: %s, Album: %s, Artist: %s, Album_artist: %s \n Duration: %d, Played time: %d\n", title, album, artist, album_artist, duration, time_played); + media_content_debug("Title: %s, Album: %s, Artist: %s, Album_artist: %s \n Duration: %d, Played time: %ld\n", title, album, artist, album_artist, duration, time_played); } SAFE_FREE(title); @@ -1314,7 +1314,7 @@ int test_gallery_scenario(void) if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_bookmark_get_thumbnail_path : [%d]", ret); - media_content_debug("Bookmark time : %d\nBookmar thumb: %s", marked_time, thumb_path); + media_content_debug("Bookmark time : %ld\nBookmar thumb: %s", marked_time, thumb_path); SAFE_FREE(thumb_path); } @@ -2291,7 +2291,7 @@ int test_group_operation(void) ret = media_group_get_group_count_from_db(g_filter, idx, &group_count); if (ret != MEDIA_CONTENT_ERROR_NONE) { test_filter_destroy(); - media_content_error("media_group_get_group_count_from_db fail. idx=[%d]", ret, idx); + media_content_error("media_group_get_group_count_from_db fail. ret=[%d] idx=[%d]", ret, idx); return ret; } else { media_content_debug("[%2d]group_count [%d]", idx, group_count); @@ -2715,11 +2715,9 @@ bool start_face_detection_cb(media_info_h media, void *user_data) ret = media_info_clone(&dst, media); if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_clone failed: %d", ret); - else { - ret = media_info_start_face_detection(dst, face_detection_complete_cb, dst); - if (ret != MEDIA_CONTENT_ERROR_NONE) - media_content_error("media_info_start_face_detection failed: %d", ret); - } + + GList **list = (GList**)user_data; + *list = g_list_append(*list, dst); /* fix prevent: Resource leak */ SAFE_FREE(media_id); @@ -2771,14 +2769,27 @@ bool cancel_face_detection_cb(media_info_h media, void *user_data) gboolean face_detection_start(gpointer data) { int ret = MEDIA_CONTENT_ERROR_NONE; + GList *all_item_list = NULL; + int idx = 0; - ret = media_info_foreach_media_from_db(g_filter, start_face_detection_cb, NULL); + ret = media_info_foreach_media_from_db(g_filter, start_face_detection_cb, &all_item_list); if (ret == MEDIA_CONTENT_ERROR_NONE) media_content_debug("media_info_foreach_media_from_db is success"); else media_content_error("media_info_foreach_media_from_db is failed"); + for (idx = 0; idx < g_list_length(all_item_list); idx++) { + media_info_h media_handle = NULL; + + media_handle = (media_info_h)g_list_nth_data(all_item_list, idx); + + ret = media_info_start_face_detection(media_handle, face_detection_complete_cb, NULL); + if (ret != MEDIA_CONTENT_ERROR_NONE) + media_content_error("media_info_start_face_detection failed: %d", ret); + + } + return false; } @@ -3520,19 +3531,19 @@ int test_create_handle(void) media_content_debug("favorite = [%d]", bool_value); ret = media_info_get_played_time(media, &modified_time); - media_content_debug("played_time = [%d]", modified_time); + media_content_debug("played_time = [%ld]", modified_time); ret = media_info_get_played_count(media, &int_value); media_content_debug("played_count = [%d]", int_value); ret = media_info_get_added_time(media, &modified_time); - media_content_debug("added_time = [%d]", modified_time); + media_content_debug("added_time = [%ld]", modified_time); ret = media_info_get_size(media, &content_size); - media_content_debug("size = [%d]", content_size); + media_content_debug("size = [%llu]", content_size); ret = media_info_get_modified_time(media, &modified_time); - media_content_debug("modified_time = [%d]", modified_time); + media_content_debug("modified_time = [%ld]", modified_time); ret = media_info_get_media_type(media, (media_content_type_e *)&int_value); media_content_debug("media_type = [%d]", int_value); -- 2.7.4