apply content_retip_if_fail() for invalid parameters

[platform/core/api/media-content.git] / src / media_group.c

diff --git a/src/media_group.c b/src/media_group.c
index f3f1d12..98f1eb5 100755 (executable)
--- a/src/media_group.c
+++ b/src/media_group.c
@@ -20,58 +20,33 @@
 
 int media_album_get_album_count_from_db(filter_h filter, int *album_count)
 {
-       int ret = MEDIA_CONTENT_ERROR_NONE;
+       content_retip_if_fail(album_count);
 
-       if (album_count != NULL)
-               ret = _media_db_get_group_count(filter, MEDIA_GROUP_ALBUM, album_count);
-       else {
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       return _media_db_get_group_count(filter, MEDIA_GROUP_ALBUM, album_count);
 
-       return ret;
 }
 
 int media_album_foreach_album_from_db(filter_h filter, media_album_cb callback, void *user_data)
 {
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       if (callback == NULL) {
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       ret = _media_db_get_album(filter, callback, user_data);
+       content_retip_if_fail(callback);
 
-       return ret;
+       return _media_db_get_album(filter, callback, user_data);
 }
 
 int media_album_get_media_count_from_db(int album_id, filter_h filter, int *media_count)
 {
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       if ((album_id > 0) && (media_count != NULL))
-               ret = _media_db_get_group_item_count_by_id(album_id, filter, MEDIA_GROUP_ALBUM, media_count);
-       else {
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       content_retip_if_fail(album_id > 0);
+       content_retip_if_fail(media_count);
 
-       return ret;
+       return _media_db_get_group_item_count_by_id(album_id, filter, MEDIA_GROUP_ALBUM, media_count);
 }
 
 int media_album_foreach_media_from_db(int album_id, filter_h filter, media_info_cb callback, void *user_data)
 {
-       int ret = MEDIA_CONTENT_ERROR_NONE;
+       content_retip_if_fail(album_id > 0);
+       content_retip_if_fail(callback);
 
-       if ((album_id > 0) && (callback != NULL))
-               ret = _media_db_get_group_item_by_id(album_id, filter, callback, user_data, MEDIA_GROUP_ALBUM);
-       else {
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       return ret;
+       return _media_db_get_group_item_by_id(album_id, filter, callback, user_data, MEDIA_GROUP_ALBUM);
 }
 
 int media_album_get_album_from_db(int album_id, media_album_h *album)
@@ -106,22 +81,16 @@ int media_album_get_album_from_db(int album_id, media_album_h *album)
 
 int media_album_destroy(media_album_h album)
 {
-       int ret = MEDIA_CONTENT_ERROR_NONE;
        media_album_s *_album = (media_album_s*)album;
 
-       if (_album) {
-               g_free(_album->name);
-               g_free(_album->artist);
-               g_free(_album->album_art_path);
-               g_free(_album);
+       content_retip_if_fail(album);
 
-               ret = MEDIA_CONTENT_ERROR_NONE;
-       } else {
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       g_free(_album->name);
+       g_free(_album->artist);
+       g_free(_album->album_art_path);
+       g_free(_album);
 
-       return ret;
+       return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_album_clone(media_album_h *dst, media_album_h src)
@@ -145,18 +114,14 @@ int media_album_clone(media_album_h *dst, media_album_h src)
 
 int media_album_get_album_id(media_album_h album, int *album_id)
 {
-       int ret = MEDIA_CONTENT_ERROR_NONE;
        media_album_s *_album = (media_album_s*)album;
 
-       if (_album && album_id) {
-               *album_id = _album->album_id;
-               ret = MEDIA_CONTENT_ERROR_NONE;
-       } else {
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       content_retip_if_fail(album);
+       content_retip_if_fail(album_id);
 
-       return ret;
+       *album_id = _album->album_id;
+
+       return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_album_get_name(media_album_h album, char **name)