X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmedia_bookmark.c;h=5c8f88ca86c4fc1052635666b003bddc345d10b5;hb=392810363ac613a41b96c73c9d87effefe3fabb3;hp=81af59ba400079b77be204b182082b9cc566640b;hpb=4930f2cdfd845fc59941eb475b031c829bce73bd;p=platform%2Fcore%2Fapi%2Fmedia-content.git

diff --git a/src/media_bookmark.c b/src/media_bookmark.c
index 81af59b..5c8f88c 100755
--- a/src/media_bookmark.c
+++ b/src/media_bookmark.c
@@ -24,7 +24,7 @@ static int __media_bookmark_check_media_id(const char *media_id)
 	sqlite3_stmt *stmt = NULL;
 	int item_count = 0;
 
-	content_retvm_if(!STRING_VALID(media_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid media_id");
+	content_retip_if_fail(STRING_VALID(media_id));
 
 	query_str = sqlite3_mprintf(SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID, media_id);
 	ret = _content_get_result(query_str, &stmt);
@@ -45,7 +45,8 @@ int media_bookmark_insert_to_db(const char *media_id, time_t time, const char *t
 {
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 	char *sql = NULL;
-	content_retvm_if(!STRING_VALID(media_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+	content_retip_if_fail(STRING_VALID(media_id));
 
 	sql = sqlite3_mprintf(INSERT_BOOKMARK_TO_BOOKMARK, media_id, time, thumbnail_path, MEDIA_CONTENT_EMPTY_STRING);
 	ret = _content_query_sql(sql);
@@ -58,7 +59,8 @@ int media_bookmark_delete_from_db(int bookmark_id)
 {
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 	char *query_str = NULL;
-	content_retvm_if(bookmark_id < 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+	content_retip_if_fail(bookmark_id >= 0);
 
 	query_str = sqlite3_mprintf(DELETE_BOOKMARK_FROM_BOOKMARK, bookmark_id);
 	ret = _content_query_sql(query_str);
@@ -69,14 +71,14 @@ int media_bookmark_delete_from_db(int bookmark_id)
 
 int media_bookmark_get_bookmark_count_from_db(filter_h filter, int *bookmark_count)
 {
-	content_retvm_if(!bookmark_count, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+	content_retip_if_fail(bookmark_count);
 
 	return _media_db_get_group_count(filter, MEDIA_GROUP_BOOKMARK, bookmark_count);
 }
 
 int media_bookmark_foreach_bookmark_from_db(filter_h filter, media_bookmark_cb callback, void *user_data)
 {
-	content_retvm_if(!callback, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid paramter");
+	content_retip_if_fail(callback);
 
 	return _media_db_get_bookmark(NULL, filter, callback, user_data);
 }
@@ -84,7 +86,8 @@ int media_bookmark_foreach_bookmark_from_db(filter_h filter, media_bookmark_cb c
 int media_bookmark_destroy(media_bookmark_h bookmark)
 {
 	media_bookmark_s *_bookmark = (media_bookmark_s *)bookmark;
-	content_retvm_if(!_bookmark, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid paramter");
+
+	content_retip_if_fail(bookmark);
 
 	g_free(_bookmark->media_id);
 	g_free(_bookmark->thumbnail_path);
@@ -116,7 +119,9 @@ int media_bookmark_clone(media_bookmark_h *dst, media_bookmark_h src)
 int media_bookmark_get_bookmark_id(media_bookmark_h bookmark, int *bookmark_id)
 {
 	media_bookmark_s *_bookmark = (media_bookmark_s *)bookmark;
-	content_retvm_if(!_bookmark || !bookmark_id, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+	content_retip_if_fail(bookmark);
+	content_retip_if_fail(bookmark_id);
 
 	*bookmark_id = _bookmark->bookmark_id;
 
@@ -126,7 +131,9 @@ int media_bookmark_get_bookmark_id(media_bookmark_h bookmark, int *bookmark_id)
 int media_bookmark_get_marked_time(media_bookmark_h bookmark, time_t* marked_time)
 {
 	media_bookmark_s *_bookmark = (media_bookmark_s *)bookmark;
-	content_retvm_if(!_bookmark || !marked_time, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+	content_retip_if_fail(bookmark);
+	content_retip_if_fail(marked_time);
 
 	*marked_time = _bookmark->marked_time;
 
@@ -174,7 +181,8 @@ int media_bookmark_update_to_db(media_bookmark_h bookmark)
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_bookmark_s *_bookmark = (media_bookmark_s *)bookmark;
 	char *sql = NULL;
-	content_retvm_if(!_bookmark, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+	content_retip_if_fail(bookmark);
 
 	sql = sqlite3_mprintf(UPDATE_BOOKMARK_FROM_BOOKMARK, _bookmark->name, _bookmark->bookmark_id);
 	ret = _content_query_sql(sql);
@@ -223,8 +231,8 @@ int media_bookmark_insert_to_db_v2(media_bookmark_h bookmark)
 	sqlite3_stmt *stmt = NULL;
 	int bookmark_id = -1;
 
-	content_retvm_if(!_bookmark, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid bookmark");
-	content_retvm_if(_bookmark->bookmark_id != -1, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid bookmark");
+	content_retip_if_fail(bookmark);
+	content_retip_if_fail(_bookmark->bookmark_id == -1);
 
 	sql = sqlite3_mprintf(INSERT_BOOKMARK_TO_BOOKMARK,
 		_bookmark->media_id, _bookmark->marked_time, _bookmark->thumbnail_path, _bookmark->name);