Remove out of memory related code by using glib APIs

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

diff --git a/src/media_group.c b/src/media_group.c
index e44a480..f3f1d12 100755 (executable)
--- a/src/media_group.c
+++ b/src/media_group.c
@@ -80,8 +80,8 @@ int media_album_get_album_from_db(int album_id, media_album_h *album)
        sqlite3_stmt *stmt = NULL;
        char select_query[DEFAULT_QUERY_SIZE] = {0, };
 
-       content_retvm_if(album_id <= 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid album_id [%d]", album_id);
-       content_retvm_if(album == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid album");
+       content_retipm_if_fail(album_id > 0, "album_id [%d]", album_id);
+       content_retip_if_fail(album);
 
        snprintf(select_query, sizeof(select_query), SELECT_ALBUM_FROM_ALBUM, album_id);
 
@@ -89,12 +89,7 @@ int media_album_get_album_from_db(int album_id, media_album_h *album)
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW) {
-               media_album_s *_album = (media_album_s*)calloc(1, sizeof(media_album_s));
-               if (_album == NULL) {
-                       content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                       SQLITE3_FINALIZE(stmt);
-                       return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-               }
+               media_album_s *_album = g_new0(media_album_s, 1);
 
                _album->album_id = album_id;
                _album->name = g_strdup((const char *)sqlite3_column_text(stmt, 0));
@@ -115,10 +110,10 @@ int media_album_destroy(media_album_h album)
        media_album_s *_album = (media_album_s*)album;
 
        if (_album) {
-               SAFE_FREE(_album->name);
-               SAFE_FREE(_album->artist);
-               SAFE_FREE(_album->album_art_path);
-               SAFE_FREE(_album);
+               g_free(_album->name);
+               g_free(_album->artist);
+               g_free(_album->album_art_path);
+               g_free(_album);
 
                ret = MEDIA_CONTENT_ERROR_NONE;
        } else {
@@ -131,51 +126,21 @@ int media_album_destroy(media_album_h album)
 
 int media_album_clone(media_album_h *dst, media_album_h src)
 {
-       int ret = MEDIA_CONTENT_ERROR_NONE;
        media_album_s *_src = (media_album_s*)src;
 
-       if (_src != NULL) {
-               media_album_s *_dst = (media_album_s*)calloc(1, sizeof(media_album_s));
-               content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-
-               _dst->album_id = _src->album_id;
-
-               if (_src->name != NULL) {
-                       _dst->name = g_strdup(_src->name);
-                       if (_dst->name == NULL) {
-                               content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               media_album_destroy((media_album_h)_dst);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
-               }
-
-               if (_src->artist != NULL) {
-                       _dst->artist = g_strdup(_src->artist);
-                       if (_dst->artist == NULL) {
-                               content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               media_album_destroy((media_album_h)_dst);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
-               }
-
-               if (_src->album_art_path != NULL) {
-                       _dst->album_art_path = g_strdup(_src->album_art_path);
-                       if (_dst->album_art_path == NULL) {
-                               content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               media_album_destroy((media_album_h)_dst);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
-               }
-
-               *dst = (media_album_h)_dst;
+       content_retip_if_fail(dst);
+       content_retip_if_fail(src);
 
-               ret = MEDIA_CONTENT_ERROR_NONE;
-       } else {
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_album_s *_dst = g_new0(media_album_s, 1);
 
-       return ret;
+       _dst->album_id = _src->album_id;
+       _dst->name = g_strdup(_src->name);
+       _dst->artist = g_strdup(_src->artist);
+       _dst->album_art_path = g_strdup(_src->album_art_path);
+
+       *dst = (media_album_h)_dst;
+
+       return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_album_get_album_id(media_album_h album, int *album_id)
@@ -196,68 +161,38 @@ int media_album_get_album_id(media_album_h album, int *album_id)
 
 int media_album_get_name(media_album_h album, char **name)
 {
-       int ret = MEDIA_CONTENT_ERROR_NONE;
        media_album_s *_album = (media_album_s*)album;
 
-       if (_album) {
-               if (_album->name != NULL) {
-                       *name = g_strdup(_album->name);
-                       content_retvm_if(*name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-               } else {
-                       *name = NULL;
-               }
+       content_retip_if_fail(album);
+       content_retip_if_fail(name);
 
-               ret = MEDIA_CONTENT_ERROR_NONE;
-       } else {
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       *name = g_strdup(_album->name);
 
-       return ret;
+       return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_album_get_artist(media_album_h album, char **artist)
 {
-       int ret = MEDIA_CONTENT_ERROR_NONE;
        media_album_s *_album = (media_album_s*)album;
 
-       if (_album) {
-               if (_album->artist != NULL) {
-                       *artist = g_strdup(_album->artist);
-                       content_retvm_if(*artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-               } else {
-                       *artist = NULL;
-               }
+       content_retip_if_fail(album);
+       content_retip_if_fail(artist);
 
-               ret = MEDIA_CONTENT_ERROR_NONE;
-       } else {
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       *artist = g_strdup(_album->artist);
 
-       return ret;
+       return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_album_get_album_art(media_album_h album, char **album_art)
 {
-       int ret = MEDIA_CONTENT_ERROR_NONE;
        media_album_s *_album = (media_album_s*)album;
 
-       if (_album) {
-               if (_album->album_art_path != NULL) {
-                       *album_art = g_strdup(_album->album_art_path);
-                       content_retvm_if(*album_art == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-               } else {
-                       *album_art = NULL;
-               }
+       content_retip_if_fail(album);
+       content_retip_if_fail(album_art);
 
-               ret = MEDIA_CONTENT_ERROR_NONE;
-       } else {
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       *album_art = g_strdup(_album->album_art_path);
 
-       return ret;
+       return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_group_get_group_count_from_db(filter_h filter, media_group_e group, int *group_count)