From 5e391e1d95850b672907425d17e64a141b5c4540 Mon Sep 17 00:00:00 2001 From: Hyunjun Ko Date: Mon, 15 Apr 2013 11:14:00 +0900 Subject: [PATCH] Fix prevent defects --- packaging/libmedia-service.spec | 2 +- src/common/media-svc.c | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec index ac23514..4660f66 100755 --- a/packaging/libmedia-service.spec +++ b/packaging/libmedia-service.spec @@ -1,6 +1,6 @@ Name: libmedia-service Summary: Media information service library for multimedia applications. -Version: 0.2.36 +Version: 0.2.37 Release: 1 Group: System/Libraries License: Apache License, Version 2.0 diff --git a/src/common/media-svc.c b/src/common/media-svc.c index 90f3325..5f1d935 100755 --- a/src/common/media-svc.c +++ b/src/common/media-svc.c @@ -384,7 +384,10 @@ int media_svc_insert_item_immediately(MediaSvcHandle *handle, media_svc_storage_ media_svc_error("thumbnail_request_from_db failed: %d", ret); } else { media_svc_debug("thumbnail_request_from_db success: %s", thumb_path); - __media_svc_malloc_and_strncpy(&(content_info.thumbnail_path), thumb_path); + ret = __media_svc_malloc_and_strncpy(&(content_info.thumbnail_path), thumb_path); + if (ret < 0) { + media_svc_error("__media_svc_malloc_and_strncpy failed : %d", ret); + } } if (content_info.media_meta.width <= 0) @@ -871,10 +874,6 @@ int media_svc_refresh_item(MediaSvcHandle *handle, media_svc_storage_type_e stor return MEDIA_INFO_ERROR_INVALID_PARAMETER; } - /* Get notification info */ - media_svc_noti_item *noti_item = NULL; - ret = _media_svc_get_noti_info(handle, path, MS_MEDIA_ITEM_FILE, ¬i_item); - media_svc_retv_if(ret != MEDIA_INFO_ERROR_NONE, ret); media_svc_content_info_s content_info; memset(&content_info, 0, sizeof(media_svc_content_info_s)); @@ -890,7 +889,9 @@ int media_svc_refresh_item(MediaSvcHandle *handle, media_svc_storage_type_e stor if (g_file_test(thumb_path, G_FILE_TEST_EXISTS) && (strncmp(thumb_path, MEDIA_SVC_THUMB_DEFAULT_PATH, sizeof(MEDIA_SVC_THUMB_DEFAULT_PATH)) != 0)) { ret = _media_svc_remove_file(thumb_path); - media_svc_retv_if(ret != TRUE, ret); + if (ret < MEDIA_INFO_ERROR_NONE) { + media_svc_error("_media_svc_remove_file failed : %s", thumb_path); + } } ret = _media_svc_update_thumbnail_path(handle, path, NULL); @@ -917,7 +918,10 @@ int media_svc_refresh_item(MediaSvcHandle *handle, media_svc_storage_type_e stor media_svc_error("thumbnail_request_from_db failed: %d", ret); } else { media_svc_debug("thumbnail_request_from_db success: %s", thumb_path); - __media_svc_malloc_and_strncpy(&(content_info.thumbnail_path), thumb_path); + ret = __media_svc_malloc_and_strncpy(&(content_info.thumbnail_path), thumb_path); + if (ret < 0) { + media_svc_error("__media_svc_malloc_and_strncpy failed : %d", ret); + } } if (content_info.media_meta.width <= 0) @@ -929,6 +933,11 @@ int media_svc_refresh_item(MediaSvcHandle *handle, media_svc_storage_type_e stor #endif ret = _media_svc_update_item_with_data(db_handle, &content_info); + /* Get notification info */ + media_svc_noti_item *noti_item = NULL; + ret = _media_svc_get_noti_info(handle, path, MS_MEDIA_ITEM_FILE, ¬i_item); + media_svc_retv_if(ret != MEDIA_INFO_ERROR_NONE, ret); + if (ret == MEDIA_INFO_ERROR_NONE) { media_svc_debug("Update is successful. Sending noti for this"); _media_svc_publish_noti(MS_MEDIA_ITEM_FILE, MS_MEDIA_ITEM_UPDATE, content_info.path, media_type, noti_item->media_uuid, noti_item->mime_type); @@ -1190,4 +1199,4 @@ int media_svc_count_invalid_items_in_folder(MediaSvcHandle *handle, const char * media_svc_retvm_if(count == NULL, MEDIA_INFO_ERROR_INVALID_PARAMETER, "count is NULL"); return _media_svc_count_invalid_folder_items(db_handle, folder_path, count); -} \ No newline at end of file +} -- 2.7.4