diff options
| author | hj kim <backto.kim@samsung.com> | 2020-03-11 13:49:48 +0900 |
|---|---|---|
| committer | hj kim <backto.kim@samsung.com> | 2020-03-11 07:04:43 +0000 |
| commit | 2197bb99f6f3dd2d23ef290f74ce7567b780fa53 (patch) | |
| tree | 3f428377afdac85f3c594a8e293dbee72a5e33fa | |
| parent | 2509de2fa05309777239cfdadec7f2a0904042be (diff) | |
| download | libmedia-service-2197bb99f6f3dd2d23ef290f74ce7567b780fa53.tar.gz libmedia-service-2197bb99f6f3dd2d23ef290f74ce7567b780fa53.tar.bz2 libmedia-service-2197bb99f6f3dd2d23ef290f74ce7567b780fa53.zip | |
Fix wrong error value check
Change-Id: I64632bc46092b3fcafc98dba4eca778f089c5aad
(cherry picked from commit 9d46740e7346799958dcc263434202d74af086bd)
| -rw-r--r-- | src/common/media-svc-util.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c index cac4209..fb939d5 100644 --- a/src/common/media-svc-util.c +++ b/src/common/media-svc-util.c @@ -1697,15 +1697,9 @@ int _media_svc_create_thumbnail(const char *path, char *thumb_path, media_svc_me unsigned int thumb_h = THUMB_HEIGHT; mm_util_img_codec_type image_type = IMG_CODEC_UNKNOWN_TYPE; - if (path == NULL || thumb_path == NULL) { - media_svc_error("Invalid parameter"); - return MS_MEDIA_ERR_INVALID_PARAMETER; - } - - if (!g_file_test(path, G_FILE_TEST_IS_REGULAR)) { - media_svc_error("Original path(%s) doesn't exist.", path); - return MS_MEDIA_ERR_INVALID_PARAMETER; - } + media_svc_retvm_if(!path, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid path"); + media_svc_retvm_if(!thumb_path, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid thumb_path"); + media_svc_retvm_if(!g_file_test(path, G_FILE_TEST_IS_REGULAR), MS_MEDIA_ERR_INVALID_PARAMETER, "File doesn't exist[%s]", path); ms_user_storage_type_e store_type = -1; ret = ms_user_get_storage_type(uid, path, &store_type); @@ -1728,7 +1722,7 @@ int _media_svc_create_thumbnail(const char *path, char *thumb_path, media_svc_me //2. save thumbnail if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) { ret = mm_util_extract_image_info(path, &image_type, &origin_w, &origin_h); - if (ret != MS_MEDIA_ERR_NONE) { + if (ret != MM_UTIL_ERROR_NONE) { media_svc_error("Getting image info is failed err: %d", ret); SAFE_STRLCPY(thumb_path, "", MAX_FILEPATH_LEN); return MS_MEDIA_ERR_INTERNAL; |