media_svc_refresh_item cleanup

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

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index 484f289..5f8d1c1 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -452,44 +452,35 @@ int media_svc_refresh_item(sqlite3 *handle, bool is_direct, const char *storage_
 {
        int ret = MS_MEDIA_ERR_NONE;
        char thumb_path[MEDIA_SVC_PATHNAME_SIZE + 1] = {0, };
+       media_svc_content_info_s content_info = {0, };
+       media_svc_noti_item *noti_item = NULL;
 
        media_svc_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
        media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
        media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
        media_svc_retvm_if(!_media_svc_is_valid_storage_type(storage_type), MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
-       media_svc_content_info_s content_info;
-       memset(&content_info, 0, sizeof(media_svc_content_info_s));
-
        /*Set media info*/
        ret = _media_svc_set_media_info(&content_info, storage_id, storage_type, path, true);
-       if (ret != MS_MEDIA_ERR_NONE)
-               return ret;
+       media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
        /* Initialize thumbnail information to remake thumbnail. */
        ret = _media_svc_get_thumbnail_path_by_path(handle, path, thumb_path);
-       if (ret != MS_MEDIA_ERR_NONE && ret != MS_MEDIA_ERR_DB_NO_RECORD) {
-               _media_svc_destroy_content_info(&content_info);
-               return ret;
-       }
+       if (ret != MS_MEDIA_ERR_NONE && ret != MS_MEDIA_ERR_DB_NO_RECORD)
+               goto REFRESH_FINALIZE;
 
        if (STRING_VALID(thumb_path)) {
                _media_svc_remove_file(thumb_path);
 
                ret = _media_svc_update_thumbnail_path(path, NULL, uid);
-               if (ret != MS_MEDIA_ERR_NONE) {
-                       _media_svc_destroy_content_info(&content_info);
-                       return ret;
-               }
+               if (ret != MS_MEDIA_ERR_NONE)
+                       goto REFRESH_FINALIZE;
        }
 
        /* Get notification info */
-       media_svc_noti_item *noti_item = NULL;
        ret = _media_svc_get_noti_info(handle, path, &noti_item);
-       if (ret != MS_MEDIA_ERR_NONE) {
-               _media_svc_destroy_content_info(&content_info);
-               return ret;
-       }
+       if (ret != MS_MEDIA_ERR_NONE)
+               goto REFRESH_FINALIZE;
 
        content_info.media_type = noti_item->media_type;
        content_info.mime_type = g_strdup(noti_item->mime_type);
@@ -509,11 +500,8 @@ int media_svc_refresh_item(sqlite3 *handle, bool is_direct, const char *storage_
                break;
        }
 
-       if (ret != MS_MEDIA_ERR_NONE) {
-               _media_svc_destroy_noti_item(noti_item);
-               _media_svc_destroy_content_info(&content_info);
-               return ret;
-       }
+       if (ret != MS_MEDIA_ERR_NONE)
+               goto REFRESH_FINALIZE;
 
        /* Extracting thumbnail */
        if (content_info.thumbnail_path == NULL) {
@@ -534,7 +522,7 @@ int media_svc_refresh_item(sqlite3 *handle, bool is_direct, const char *storage_
                        if (++g_media_svc_cur_data_cnt == BATCH_ITEM_COUNT_MAX) {
                                ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_SCANNER, uid);
                                if (ret != MS_MEDIA_ERR_NONE)
-                                       goto QUERY_ERROR;
+                                       goto REFRESH_FINALIZE;
 
                                g_media_svc_cur_data_cnt = 0;
                        }
@@ -547,7 +535,7 @@ int media_svc_refresh_item(sqlite3 *handle, bool is_direct, const char *storage_
                media_svc_error("_media_svc_update_item_with_data failed : %d", ret);
        }
 
-QUERY_ERROR:
+REFRESH_FINALIZE:
        _media_svc_destroy_content_info(&content_info);
        _media_svc_destroy_noti_item(noti_item);