Merge function for getting thumbnail folder

[platform/core/multimedia/libmedia-service.git] / src / common / media-svc-util.c

diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c
index 4aec387..2ad5b82 100755 (executable)
--- a/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@ -907,29 +907,20 @@ int _media_svc_get_thumbnail_path(media_svc_storage_type_e storage_type, char *t
        int ret = MS_MEDIA_ERR_NONE;
        char savename[MEDIA_SVC_PATHNAME_SIZE] = {0, };
        char file_ext[MEDIA_SVC_FILE_EXT_LEN_MAX + 1] = {0, };
-       char *thumb_dir = NULL;
        char hash[255 + 1] = {0, };
        char *thumbfile_ext = NULL;
-       char *internal_thumb_path = NULL;
-       char *external_thumb_path = NULL;
-
-       ret = ms_user_get_default_thumb_store_path(uid, &internal_thumb_path);
-       ret = ms_user_get_mmc_thumb_store_path(uid, &external_thumb_path);
+       char *thumb_dir = NULL;
 
-       if (!STRING_VALID(internal_thumb_path) || !STRING_VALID(external_thumb_path)) {
-               media_svc_error("fail to get thumbnail path");
-               SAFE_FREE(internal_thumb_path);
-               SAFE_FREE(external_thumb_path);
+       ret = ms_user_get_thumb_store_path(uid, storage_type, &thumb_dir);
+       if (!STRING_VALID(thumb_dir)) {
+               media_svc_error("ms_user_get_thumb_store_path failed");
                return MS_MEDIA_ERR_INTERNAL;
        }
 
-       thumb_dir = (storage_type == MEDIA_SVC_STORAGE_INTERNAL) ? internal_thumb_path : external_thumb_path;
-
        ret = __media_svc_check_thumb_dir(thumb_dir);
        if (ret != MS_MEDIA_ERR_NONE) {
                media_svc_error("__media_svc_check_thumb_dir");
-               SAFE_FREE(internal_thumb_path);
-               SAFE_FREE(external_thumb_path);
+               SAFE_FREE(thumb_dir);
                return MS_MEDIA_ERR_INTERNAL;
        }
 
@@ -940,8 +931,7 @@ int _media_svc_get_thumbnail_path(media_svc_storage_type_e storage_type, char *t
        ret = mb_svc_generate_hash_code(pathname, hash, sizeof(hash));
        if (ret != MS_MEDIA_ERR_NONE) {
                media_svc_error("mb_svc_generate_hash_code failed : %d", ret);
-               SAFE_FREE(internal_thumb_path);
-               SAFE_FREE(external_thumb_path);
+               SAFE_FREE(thumb_dir);
                return MS_MEDIA_ERR_INTERNAL;
        }
 
@@ -957,8 +947,7 @@ int _media_svc_get_thumbnail_path(media_svc_storage_type_e storage_type, char *t
                thumbfile_ext = (char *)"bmp";
        } else {
                media_svc_error("Not proper img format");
-               SAFE_FREE(internal_thumb_path);
-               SAFE_FREE(external_thumb_path);
+               SAFE_FREE(thumb_dir);
                return MS_MEDIA_ERR_INTERNAL;
        }
 
@@ -966,8 +955,7 @@ int _media_svc_get_thumbnail_path(media_svc_storage_type_e storage_type, char *t
        SAFE_STRLCPY(thumb_path, savename, MEDIA_SVC_PATHNAME_SIZE);
        /*media_svc_debug("thumb_path is [%s]", thumb_path); */
 
-       SAFE_FREE(internal_thumb_path);
-       SAFE_FREE(external_thumb_path);
+       SAFE_FREE(thumb_dir);
 
        return MS_MEDIA_ERR_NONE;
 }