Code cleanup

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

diff --git a/src/thumbnail_util.c b/src/thumbnail_util.c
index 286eb025a18df9e59bbf2970fa7f5cfe53fab072..e9fee216e9a0b6d70d16c6ac65e1903de0677587 100644 (file)
--- a/src/thumbnail_util.c
+++ b/src/thumbnail_util.c
@@ -73,36 +73,27 @@ static void __thumbnail_util_extract_completed_cb(int error,
 
 int thumbnail_util_create(thumbnail_h *thumb)
 {
-       int ret = THUMBNAIL_UTIL_ERROR_NONE;
+       thumbnail_s *_thumb = NULL;
+
        thumbnail_util_warn("DEPRECATION WARNING: thumbnail_util_create() is deprecated and will be removed from next release.");
+       thumbnail_util_retvm_if(!thumb, THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER, "Invalid handle");
 
-       if (thumb == NULL) {
-               thumbnail_util_error("INVALID_PARAMETER(0x%08x)", THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER);
-               return THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER;
-       }
+       _thumb = g_new0(thumbnail_s, 1);
 
-       thumbnail_s *_thumb = (thumbnail_s *)malloc(sizeof(thumbnail_s));
-       if (_thumb == NULL) {
-               thumbnail_util_error("OUT_OF_MEMORY(0x%08x)", THUMBNAIL_UTIL_ERROR_OUT_OF_MEMORY);
-               return THUMBNAIL_UTIL_ERROR_OUT_OF_MEMORY;
-       }
-
-       _thumb->request_id = 0;
-       _thumb->file_path = NULL;
        _thumb->dst_width = CONTENT_THUMB_DEFAULT_WIDTH;
        _thumb->dst_height = CONTENT_THUMB_DEFAULT_HEIGHT;
 
        *thumb = (thumbnail_h)_thumb;
 
-       return ret;
+       return THUMBNAIL_UTIL_ERROR_NONE;
 }
 
 int thumbnail_util_extract(thumbnail_h thumb, thumbnail_extracted_cb callback, void *user_data, char **request_id)
 {
-       int ret = THUMBNAIL_UTIL_ERROR_NONE;
        thumbnail_util_warn("DEPRECATION WARNING: thumbnail_util_extract() is deprecated and will be removed from next release. Use thumbnail_util_extract_to_file() or thumbnail_util_extract_to_buffer() instead.");
-       int res = 0;
+       int ret = THUMBNAIL_UTIL_ERROR_NONE;
        static int g_thumbnail_req_id = 0;
+       thumbnail_extract_cb_s *_thumb_cb = NULL;
        thumbnail_s *_thumb = (thumbnail_s *)thumb;
 
        thumbnail_util_retvm_if(!_thumb, THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER, "Invalid handle");
@@ -110,59 +101,53 @@ int thumbnail_util_extract(thumbnail_h thumb, thumbnail_extracted_cb callback, v
 
        _thumb->request_id = ++g_thumbnail_req_id;
 
-       thumbnail_extract_cb_s *_thumb_cb = g_new0(thumbnail_extract_cb_s, 1);
-
+       _thumb_cb = g_new0(thumbnail_extract_cb_s, 1);
        _thumb_cb->user_data = user_data;
        _thumb_cb->thumb_extract_cb = callback;
 
-       res = thumbnail_request_extract_raw_data_async(_thumb->request_id,
+       ret = thumbnail_request_extract_raw_data_async(_thumb->request_id,
                                                                                                _thumb->file_path,
                                                                                                _thumb->dst_width,
                                                                                                _thumb->dst_height,
                                                                                                __thumbnail_util_extract_completed_cb,
                                                                                                (void *)_thumb_cb,
                                                                                                tzplatform_getuid(TZ_USER_NAME));
-       ret = __thumbnail_util_error_capi(res);
-       if (ret == THUMBNAIL_UTIL_ERROR_NONE)
+
+       if (ret == MS_MEDIA_ERR_NONE)
                *request_id = g_strdup_printf("%d", g_thumbnail_req_id);
        else
                g_free(_thumb_cb);
 
-       return ret;
+       return __thumbnail_util_error_capi(ret);
 }
 
 int thumbnail_util_set_path(thumbnail_h thumb, const char *path)
 {
-       int ret = THUMBNAIL_UTIL_ERROR_NONE;
        thumbnail_util_warn("DEPRECATION WARNING: thumbnail_util_set_path() is deprecated and will be removed from next release.");
        thumbnail_s *_thumb = (thumbnail_s *)thumb;
 
-       if (_thumb && STRING_VALID(path)) {
-               SAFE_FREE(_thumb->file_path);
-               _thumb->file_path = g_strdup(path);
-       } else {
-               thumbnail_util_error("INVALID_PARAMETER(0x%08x)", THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER);
-               ret = THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER;
-       }
+       thumbnail_util_retvm_if(!_thumb, THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER, "Invalid handle");
+       thumbnail_util_retvm_if(!STRING_VALID(path), THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER, "Invalid path");
+
+       g_free(_thumb->file_path);
+       _thumb->file_path = g_strdup(path);
 
-       return ret;
+       return THUMBNAIL_UTIL_ERROR_NONE;
 }
 
 int thumbnail_util_set_size(thumbnail_h thumb, int width, int height)
 {
-       int ret = THUMBNAIL_UTIL_ERROR_NONE;
        thumbnail_util_warn("DEPRECATION WARNING: thumbnail_util_set_size() is deprecated and will be removed from next release.");
        thumbnail_s *_thumb = (thumbnail_s *)thumb;
 
-       if (_thumb != NULL && width > 0 && height > 0) {
-               _thumb->dst_width = width;
-               _thumb->dst_height = height;
-       } else {
-               thumbnail_util_error("INVALID_PARAMETER(0x%08x)", THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER);
-               ret = THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER;
-       }
+       thumbnail_util_retvm_if(!_thumb, THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER, "Invalid handle");
+       thumbnail_util_retvm_if(width <= 0, THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER, "Invalid width");
+       thumbnail_util_retvm_if(height <= 0, THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER, "Invalid height");
 
-       return ret;
+       _thumb->dst_width = width;
+       _thumb->dst_height = height;
+
+       return THUMBNAIL_UTIL_ERROR_NONE;
 }
 
 int thumbnail_util_cancel(thumbnail_h thumb, const char *request_id)
@@ -171,38 +156,33 @@ int thumbnail_util_cancel(thumbnail_h thumb, const char *request_id)
        thumbnail_util_warn("DEPRECATION WARNING: thumbnail_util_cancel() is deprecated and will be removed from next release.");
        thumbnail_s *_thumb = (thumbnail_s *)thumb;
 
-       if (_thumb != NULL && STRING_VALID(request_id)) {
-               unsigned int request_id_integer = atoi(request_id);
-               ret = thumbnail_request_cancel_raw_data(request_id_integer);
-       } else {
-               thumbnail_util_error("INVALID_PARAMETER(0x%08x)", THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER);
-               ret = THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER;
-       }
+       thumbnail_util_retvm_if(!_thumb, THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER, "Invalid handle");
+       thumbnail_util_retvm_if(!STRING_VALID(request_id), THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER, "Invalid request id");
 
-       return ret;
+       ret = thumbnail_request_cancel_raw_data(atoi(request_id));
+
+       return __thumbnail_util_error_capi(ret);
 }
 
 int thumbnail_util_destroy(thumbnail_h thumb)
 {
        thumbnail_util_warn("DEPRECATION WARNING: thumbnail_util_destroy() is deprecated and will be removed from next release.");
-       int ret = THUMBNAIL_UTIL_ERROR_NONE;
        thumbnail_s *_thumb = (thumbnail_s *)thumb;
 
-       if (_thumb) {
-               SAFE_FREE(_thumb->file_path);
-               SAFE_FREE(_thumb);
-       } else {
-               thumbnail_util_error("INVALID_PARAMETER(0x%08x)", THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER);
-               ret = THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER;
-       }
+       thumbnail_util_retvm_if(!_thumb, THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER, "Invalid handle");
 
-       return ret;
+       g_free(_thumb->file_path);
+       g_free(_thumb);
+
+       return THUMBNAIL_UTIL_ERROR_NONE;
 }
 
 static int __thumbnail_util_get_file_ext(const char *file_path, char *file_ext, int max_len)
 {
        int i = 0;
 
+       thumbnail_util_retvm_if(!file_path, THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER, "Invalid path");
+
        for (i = (int)strlen(file_path); i >= 0; i--) {
                if ((file_path[i] == '.') && (i < (int)strlen(file_path))) {
                        g_strlcpy(file_ext, &file_path[i + 1], max_len);