Remove out of memory related code by using glib APIs

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

diff --git a/src/media_playlist.c b/src/media_playlist.c
index 172bbbb..3d76b6f 100755 (executable)
--- a/src/media_playlist.c
+++ b/src/media_playlist.c
@@ -23,10 +23,11 @@
 static void __media_playlist_item_free(gpointer item)
 {
        media_playlist_item_s *_item = (media_playlist_item_s *)item;
-       SAFE_FREE(_item->media_id);
-       SAFE_FREE(_item->playlist_name);
-       SAFE_FREE(_item->thumbnail_path);
-       SAFE_FREE(_item);
+
+       g_free(_item->media_id);
+       g_free(_item->playlist_name);
+       g_free(_item->thumbnail_path);
+       g_free(_item);
 }
 
 static void __media_playlist_item_release(media_playlist_s *playlist)
@@ -226,13 +227,13 @@ int media_playlist_insert_to_db(const char *name, media_playlist_h *playlist)
        int playlist_id = 0;
 
        content_retip_if_fail(STRING_VALID(name));
+       content_retip_if_fail(playlist);
 
-       media_playlist_s *_playlist = (media_playlist_s *)calloc(1, sizeof(media_playlist_s));
-       content_retvm_if(_playlist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+       media_playlist_s *_playlist = g_new0(media_playlist_s, 1);
 
        ret = __media_playlist_insert_playlist_record(name, &playlist_id);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               SAFE_FREE(_playlist);
+               g_free(_playlist);
                return ret;
        }
 
@@ -292,11 +293,12 @@ int media_playlist_foreach_media_from_db(int playlist_id, filter_h filter, playl
 int media_playlist_destroy(media_playlist_h playlist)
 {
        media_playlist_s *_playlist = (media_playlist_s *)playlist;
+
        content_retip_if_fail(playlist);
 
-       SAFE_FREE(_playlist->name);
-       SAFE_FREE(_playlist->thumbnail_path);
-       SAFE_FREE(_playlist);
+       g_free(_playlist->name);
+       g_free(_playlist->thumbnail_path);
+       g_free(_playlist);
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
@@ -304,10 +306,11 @@ int media_playlist_destroy(media_playlist_h playlist)
 int media_playlist_clone(media_playlist_h *dst, media_playlist_h src)
 {
        media_playlist_s *_src = (media_playlist_s *)src;
-       content_retip_if_fail(_src);
 
-       media_playlist_s *_dst = (media_playlist_s *)calloc(1, sizeof(media_playlist_s));
-       content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+       content_retip_if_fail(dst);
+       content_retip_if_fail(src);
+
+       media_playlist_s *_dst = g_new0(media_playlist_s, 1);
 
        _dst->playlist_id = _src->playlist_id;
        _dst->name = g_strdup(_src->name);
@@ -324,6 +327,7 @@ int media_playlist_get_playlist_from_db(int playlist_id, media_playlist_h *playl
        char *query = NULL;
 
        content_retipm_if_fail(playlist_id > 0, "%d", playlist_id);
+       content_retip_if_fail(playlist);
 
        query = sqlite3_mprintf(SELECT_PLAYLIST_FROM_PLAYLIST, playlist_id);
 
@@ -334,12 +338,7 @@ int media_playlist_get_playlist_from_db(int playlist_id, media_playlist_h *playl
        media_playlist_s *_playlist = NULL;
 
        if (sqlite3_step(stmt) == SQLITE_ROW) {
-               _playlist = (media_playlist_s *)calloc(1, sizeof(media_playlist_s));
-               if (_playlist == NULL) {
-                       content_error("Out of memory");
-                       SQLITE3_FINALIZE(stmt);
-                       return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-               }
+               _playlist = g_new0(media_playlist_s, 1);
 
                _playlist->playlist_id = playlist_id;
                _playlist->name = g_strdup((const char *)sqlite3_column_text(stmt, 0));
@@ -359,6 +358,7 @@ int media_playlist_get_playlist_from_db(int playlist_id, media_playlist_h *playl
 int media_playlist_get_playlist_id(media_playlist_h playlist, int *playlist_id)
 {
        media_playlist_s *_playlist = (media_playlist_s *)playlist;
+
        content_retip_if_fail(playlist);
        content_retip_if_fail(playlist_id);
 
@@ -370,6 +370,7 @@ int media_playlist_get_playlist_id(media_playlist_h playlist, int *playlist_id)
 int media_playlist_get_name(media_playlist_h playlist, char **name)
 {
        media_playlist_s *_playlist = (media_playlist_s *)playlist;
+
        content_retip_if_fail(playlist);
        content_retip_if_fail(name);
 
@@ -381,6 +382,7 @@ int media_playlist_get_name(media_playlist_h playlist, char **name)
 int media_playlist_get_thumbnail_path(media_playlist_h playlist, char **path)
 {
        media_playlist_s *_playlist = (media_playlist_s *)playlist;
+
        content_retip_if_fail(playlist);
        content_retip_if_fail(path);
 
@@ -421,10 +423,9 @@ int media_playlist_set_name(media_playlist_h playlist, const char *playlist_name
        content_retip_if_fail(playlist);
        content_retip_if_fail(STRING_VALID(playlist_name));
 
-       SAFE_FREE(_playlist->name);
+       g_free(_playlist->name);
 
-       item = (media_playlist_item_s *)calloc(1, sizeof(media_playlist_item_s));
-       content_retvm_if(item == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+       item = g_new0(media_playlist_item_s, 1);
 
        item->playlist_name = g_strdup(playlist_name);
        item->function = MEDIA_PLAYLIST_UPDATE_PLAYLIST_NAME;
@@ -443,10 +444,9 @@ int media_playlist_set_thumbnail_path(media_playlist_h playlist, const char *pat
        content_retip_if_fail(playlist);
        content_retip_if_fail(STRING_VALID(path));
 
-       SAFE_FREE(_playlist->thumbnail_path);
+       g_free(_playlist->thumbnail_path);
 
-       item = (media_playlist_item_s *)calloc(1, sizeof(media_playlist_item_s));
-       content_retvm_if(item == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+       item = g_new0(media_playlist_item_s, 1);
 
        item->thumbnail_path = g_strdup(path);
        item->function = MEDIA_PLAYLIST_UPDATE_THUMBNAIL_PATH;
@@ -466,8 +466,7 @@ int media_playlist_set_play_order(media_playlist_h playlist, int playlist_member
        content_retipm_if_fail(playlist_member_id > 0, "%d", playlist_member_id);
        content_retipm_if_fail(play_order >= 0, "%d", play_order);
 
-       item = (media_playlist_item_s *)calloc(1, sizeof(media_playlist_item_s));
-       content_retvm_if(item == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+       item = g_new0(media_playlist_item_s, 1);
 
        item->playlist_member_id = playlist_member_id;
        item->function = MEDIA_PLAYLIST_UPDATE_PLAY_ORDER;
@@ -486,8 +485,7 @@ int media_playlist_add_media(media_playlist_h playlist, const char *media_id)
        content_retip_if_fail(playlist);
        content_retip_if_fail(STRING_VALID(media_id));
 
-       item = (media_playlist_item_s *)calloc(1, sizeof(media_playlist_item_s));
-       content_retvm_if(item == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+       item = g_new0(media_playlist_item_s, 1);
 
        item->media_id = g_strdup(media_id);
        item->function = MEDIA_PLAYLIST_ADD;
@@ -505,8 +503,7 @@ int media_playlist_remove_media(media_playlist_h playlist, int playlist_member_i
        content_retip_if_fail(playlist);
        content_retipm_if_fail(playlist_member_id > 0, "%d", playlist_member_id);
 
-       item = (media_playlist_item_s *)calloc(1, sizeof(media_playlist_item_s));
-       content_retvm_if(item == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+       item = g_new0(media_playlist_item_s, 1);
 
        item->playlist_member_id = playlist_member_id;
        item->function = MEDIA_PLAYLIST_REMOVE;
@@ -576,7 +573,9 @@ static int __media_playlist_get_media_id_by_path(const char *path, char **media_
        int ret = MEDIA_CONTENT_ERROR_NONE;
        char *query = NULL;
        sqlite3_stmt *stmt = NULL;
+
        content_retip_if_fail(path);
+       content_retip_if_fail(media_id);
 
 #ifdef _USE_TVPD_MODE
        query = sqlite3_mprintf("SELECT media_id FROM '%q' WHERE media_path='%q'", DB_VIEW_MEDIA, path);
@@ -688,8 +687,7 @@ int media_playlist_create(media_playlist_h *playlist)
 {
        content_retip_if_fail(playlist);
 
-       media_playlist_s *_playlist = (media_playlist_s *)calloc(1, sizeof(media_playlist_s));
-       content_retvm_if(_playlist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+       media_playlist_s *_playlist = g_new0(media_playlist_s, 1);
 
        _playlist->playlist_id = -1;
        _playlist->name = NULL;