Code clean up regarding DB operation

Change-Id: Ifadad3df168252601f9c7d33b16193653296720d

diff --git a/src/media_controller_db.c b/src/media_controller_db.c
old mode 100755 (executable)
new mode 100644 (file)
index af6bafc..b8fd54e
--- a/src/media_controller_db.c
+++ b/src/media_controller_db.c
@@ -694,34 +694,26 @@ int mc_db_get_foreach_playlist(void *handle, const char *server_name, mc_playlis
        char *sql_str = NULL;
        sqlite3_stmt *stmt = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-       mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL");
-       mc_retvm_if(callback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "callback is NULL");
+       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid handle");
+       mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid server_name");
+       mc_retvm_if(callback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid callback");
 
        sql_str = sqlite3_mprintf("SELECT playlist_name from %s WHERE server_name = %Q GROUP BY playlist_name", MC_DB_TABLE_PLAYLIST, server_name);
        mc_retvm_if(!MC_STRING_VALID(sql_str), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL string is null");
 
        ret = sqlite3_prepare_v2(db_handle, sql_str, strlen(sql_str), &stmt, NULL);
-       if (SQLITE_OK != ret) {
-               mc_error("prepare error [%s]", sqlite3_errmsg(db_handle));
-               SQLITE3_SAFE_FREE(sql_str);
-               return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-       }
+       SQLITE3_SAFE_FREE(sql_str);
+       mc_retvm_if(SQLITE_OK != ret, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "prepare error [%s]", sqlite3_errmsg(db_handle));
 
        ret = sqlite3_step(stmt);
-       if (SQLITE_ROW != ret) {
-               mc_error("[No-Error] There is no server list [%s]", sqlite3_errmsg(db_handle));
-               SQLITE3_FINALIZE(stmt);
-               SQLITE3_SAFE_FREE(sql_str);
-               return MEDIA_CONTROLLER_ERROR_NONE;
-       }
+       if (SQLITE_ROW != ret)
+               mc_secure_debug("[%s] has no playlist", server_name);
 
        while (SQLITE_ROW == ret) {
                mc_playlist_s *_playlist = (mc_playlist_s *)calloc(1, sizeof(mc_playlist_s));
                if (_playlist == NULL) {
                        mc_error("OUT_OF_MEMORY");
                        SQLITE3_FINALIZE(stmt);
-                       SQLITE3_SAFE_FREE(sql_str);
                        return MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY;
                }
 
@@ -739,7 +731,6 @@ int mc_db_get_foreach_playlist(void *handle, const char *server_name, mc_playlis
        }
 
        SQLITE3_FINALIZE(stmt);
-       SQLITE3_SAFE_FREE(sql_str);
 
        return MEDIA_CONTROLLER_ERROR_NONE;
 }
@@ -792,6 +783,11 @@ int mc_db_get_playlist_item(void *handle, const char *server_name, char *playlis
        char *index = NULL;
        mc_metadata_h _metadata = NULL;
 
+       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid handle");
+       mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid server_name");
+       mc_retvm_if(playlist_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid playlist_name");
+       mc_retvm_if(callback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid callback");
+
        sql_str = sqlite3_mprintf("SELECT * from %s WHERE server_name = %Q and playlist_name = %Q and item_index IS NOT NULL  ORDER BY rowid", MC_DB_TABLE_PLAYLIST, server_name, playlist_name);
        mc_retvm_if(!MC_STRING_VALID(sql_str), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL string is null");
 
@@ -800,11 +796,8 @@ int mc_db_get_playlist_item(void *handle, const char *server_name, char *playlis
        mc_retvm_if(SQLITE_OK != ret, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "prepare error [%s]", sqlite3_errmsg(db_handle));
 
        ret = sqlite3_step(stmt);
-       if (SQLITE_ROW != ret) {
-               mc_error("[No-Error] There is no playlist itemt [%s]", sqlite3_errmsg(db_handle));
-               SQLITE3_FINALIZE(stmt);
-               return MEDIA_CONTROLLER_ERROR_NONE;
-       }
+       if (SQLITE_ROW != ret)
+               mc_secure_debug("[%s : %s] has no playlist item", server_name, playlist_name);
 
        while (SQLITE_ROW == ret) {
                ret = __mc_db_get_metadata(stmt, 3, &_metadata);        //0 : server_name, 1 : playlist_name, 2 : item_index, from 3 : metadata such as title, artist