Update __mc_db_get_metadata()

Change-Id: I70f1d6370409bac156af0cf28e30d13f6ea91bd9

diff --git a/src/media_controller_db.c b/src/media_controller_db.c
index 63916ac31527916cc430c9eb37fc4ed0ad2d4d6c..309d5cc12d41d16be5f1a6ec619ccba62e7b379a 100644 (file)
--- a/src/media_controller_db.c
+++ b/src/media_controller_db.c
@@ -262,27 +262,25 @@ static int __mc_db_get_metadata(sqlite3_stmt *stmt, int col, mc_metadata_h *meta
 {
        media_controller_metadata_s *_metadata = NULL;
 
+       mc_retvm_if(!stmt, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid stmt");
        mc_retvm_if(!metadata, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid metadata");
 
-       _metadata = (media_controller_metadata_s *)calloc(1, sizeof(media_controller_metadata_s));
-       mc_retvm_if(!_metadata, MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-
-       if (stmt != NULL) {
-               _metadata->title = g_strdup((const char *)sqlite3_column_text(stmt, col++));
-               _metadata->artist = g_strdup((const char *)sqlite3_column_text(stmt, col++));
-               _metadata->album = g_strdup((const char *)sqlite3_column_text(stmt, col++));
-               _metadata->author = g_strdup((const char *)sqlite3_column_text(stmt, col++));
-               _metadata->genre = g_strdup((const char *)sqlite3_column_text(stmt, col++));
-               _metadata->duration = g_strdup((const char *)sqlite3_column_text(stmt, col++));
-               _metadata->date = g_strdup((const char *)sqlite3_column_text(stmt, col++));
-               _metadata->copyright = g_strdup((const char *)sqlite3_column_text(stmt, col++));
-               _metadata->description = g_strdup((const char *)sqlite3_column_text(stmt, col++));
-               _metadata->track_num = g_strdup((const char *)sqlite3_column_text(stmt, col++));
-               _metadata->picture = g_strdup((const char *)sqlite3_column_text(stmt, col++));
-               _metadata->season = g_strdup((const char *)sqlite3_column_text(stmt, col++));
-               _metadata->episode = g_strdup((const char *)sqlite3_column_text(stmt, col++));
-               _metadata->resolution = g_strdup((const char *)sqlite3_column_text(stmt, col++));
-       }
+       _metadata = g_new0(media_controller_metadata_s, 1);
+
+       _metadata->title = g_strdup((const char *)sqlite3_column_text(stmt, col++));
+       _metadata->artist = g_strdup((const char *)sqlite3_column_text(stmt, col++));
+       _metadata->album = g_strdup((const char *)sqlite3_column_text(stmt, col++));
+       _metadata->author = g_strdup((const char *)sqlite3_column_text(stmt, col++));
+       _metadata->genre = g_strdup((const char *)sqlite3_column_text(stmt, col++));
+       _metadata->duration = g_strdup((const char *)sqlite3_column_text(stmt, col++));
+       _metadata->date = g_strdup((const char *)sqlite3_column_text(stmt, col++));
+       _metadata->copyright = g_strdup((const char *)sqlite3_column_text(stmt, col++));
+       _metadata->description = g_strdup((const char *)sqlite3_column_text(stmt, col++));
+       _metadata->track_num = g_strdup((const char *)sqlite3_column_text(stmt, col++));
+       _metadata->picture = g_strdup((const char *)sqlite3_column_text(stmt, col++));
+       _metadata->season = g_strdup((const char *)sqlite3_column_text(stmt, col++));
+       _metadata->episode = g_strdup((const char *)sqlite3_column_text(stmt, col++));
+       _metadata->resolution = g_strdup((const char *)sqlite3_column_text(stmt, col++));
 
        *metadata = (mc_metadata_h)_metadata;