From 07eabeafa1053420d6b6d24b6df04a6bb9114c5d Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Wed, 11 Sep 2019 09:30:33 +0900 Subject: [PATCH] Modify g_array in media_svc_update_item_meta Change-Id: Ic729f88232bc244e80093797847eb14a7a802551 Signed-off-by: Minje Ahn --- src/common/media-svc.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/common/media-svc.c b/src/common/media-svc.c index 2ef0f23..cce795b 100755 --- a/src/common/media-svc.c +++ b/src/common/media-svc.c @@ -696,9 +696,15 @@ static void __media_svc_noti_all_storage(sqlite3 *handle, uid_t uid) g_ptr_array_free(path_list, TRUE); } +static void __file_info_free(gpointer data) +{ + SAFE_FREE(*(media_svc_file_s **)data); +} + int media_svc_update_item_meta(sqlite3 *handle, uid_t uid) { int ret = MS_MEDIA_ERR_NONE; + int i = 0; /* NOTICE : After 6.0, change 'media_view' to 'media', add 'AND validity=1', and no need storage id */ char *sql = NULL; media_svc_content_info_s content_info; @@ -707,25 +713,24 @@ int media_svc_update_item_meta(sqlite3 *handle, uid_t uid) path_list = g_array_new(FALSE, FALSE, sizeof(media_svc_file_s *)); media_svc_retvm_if(!path_list, MS_MEDIA_ERR_OUT_OF_MEMORY, "Allocation failed"); + g_array_set_clear_func(path_list, __file_info_free); sql = sqlite3_mprintf("SELECT media_path, storage_uuid FROM %q WHERE media_type=3", MEDIA_SVC_DB_VIEW_MEDIA); ret = _media_svc_get_media(handle, sql, &path_list); if (ret != MS_MEDIA_ERR_NONE) { media_svc_error("Fail to get media list"); - g_array_free(path_list, false); + g_array_free(path_list, TRUE); return ret; } - while (path_list->len != 0) { - file_info = g_array_index(path_list, media_svc_file_s *, 0); - g_array_remove_index(path_list, 0); + for (i = 0; i < path_list->len; i++) { + file_info = g_array_index(path_list, media_svc_file_s *, i); memset(&content_info, 0, sizeof(media_svc_content_info_s)); ret = _media_svc_extract_music_metadata_for_update(&content_info, file_info->storage_id, file_info->path); if (ret != MS_MEDIA_ERR_NONE) { media_svc_error("Fail to extract metadata"); _media_svc_destroy_content_info(&content_info); - SAFE_FREE(file_info); continue; } @@ -734,10 +739,9 @@ int media_svc_update_item_meta(sqlite3 *handle, uid_t uid) media_svc_error("Fail to append item[%s]", content_info.path); _media_svc_destroy_content_info(&content_info); - SAFE_FREE(file_info); } - g_array_free(path_list, false); + g_array_free(path_list, TRUE); ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_UPDATE_ITEM, uid); media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "_media_svc_list_query_do failed"); -- 2.7.4