just update redundant code

Change-Id: I411216c00b7f66996d74f63d6b5b46cfcf6a4204

diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c
index 3b1254f..bdea6b4 100644 (file)
--- a/svc/media_controller_db_util.c
+++ b/svc/media_controller_db_util.c
@@ -733,17 +733,17 @@ int mc_db_parse_and_update_db(uid_t uid, const char *data, int data_size)
        params = g_strsplit(data, MC_STRING_DELIMITER, 0);
        mc_retvm_if(params == NULL, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "fail to parsing query");
 
-       if (params[0] == NULL || params[1] == NULL) {
+       if (!params[0] || !params[1]) {
                mc_error("invalid query");
-               ret = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-               goto ERROR;
+               g_strfreev(params);
+               return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
        }
 
        if (strncmp(MC_DB_CMD_UPDATE_PLAYBACK, params[0], strlen(MC_DB_CMD_UPDATE_PLAYBACK)) == 0) {
-               if (params[2] == NULL || params[3] == NULL || params[4] == NULL || params[5] == NULL) {
+               if (!params[2] || !params[3] || !params[4] || !params[5]) {
                        mc_error("invalid query");
-                       ret = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-                       goto ERROR;
+                       g_strfreev(params);
+                       return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
                }
 
                mc_safe_strtoi(params[2], &i_value);
@@ -768,20 +768,20 @@ int mc_db_parse_and_update_db(uid_t uid, const char *data, int data_size)
                                __replace_null(params[14]), __replace_null(params[15]));
 
        } else if (strncmp(MC_DB_CMD_UPDATE_SHUFFLE, params[0], strlen(MC_DB_CMD_UPDATE_SHUFFLE)) == 0) {
-               if (params[2] == NULL) {
+               if (!params[2]) {
                        mc_error("invalid query");
-                       ret = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-                       goto ERROR;
+                       g_strfreev(params);
+                       return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
                }
 
                mc_safe_strtoi(params[2], &i_value);
                sql_str = sqlite3_mprintf("UPDATE '%q' SET shuffle_mode=%d;", params[1], i_value);
 
        } else if (strncmp(MC_DB_CMD_UPDATE_REPEAT, params[0], strlen(MC_DB_CMD_UPDATE_REPEAT)) == 0) {
-               if (params[2] == NULL) {
+               if (!params[2]) {
                        mc_error("invalid query");
-                       ret = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-                       goto ERROR;
+                       g_strfreev(params);
+                       return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
                }
 
                mc_safe_strtoi(params[2], &i_value);
@@ -792,10 +792,10 @@ int mc_db_parse_and_update_db(uid_t uid, const char *data, int data_size)
 
 
        } else if (strncmp(MC_DB_CMD_ADD_PLAYLIST, params[0], strlen(MC_DB_CMD_ADD_PLAYLIST)) == 0) {
-               if (params[2] == NULL) {
+               if (!params[2]) {
                        mc_error("invalid query");
-                       ret = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-                       goto ERROR;
+                       g_strfreev(params);
+                       return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
                }
 
                sql_str = sqlite3_mprintf("INSERT INTO '%q' (server_name, playlist_name) VALUES (%Q, %Q);", MC_DB_TABLE_PLAYLIST, params[1], params[2]);
@@ -809,16 +809,16 @@ int mc_db_parse_and_update_db(uid_t uid, const char *data, int data_size)
 
                if (!params[2] || !params[3] || !params[4]) {
                        mc_error("invalid query");
-                       ret = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-                       goto ERROR;
+                       g_strfreev(params);
+                       return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
                }
 
                mc_safe_strtoi(params[3], &i_value);
                bundle = bundle_decode((bundle_raw *)params[4], i_value);
                if (!bundle) {
                        mc_error("invalid bundle_data");
-                       ret = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-                       goto ERROR;
+                       g_strfreev(params);
+                       return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
                }
 
                mc_debug("bundle item count [%d]", bundle_get_count(bundle));
@@ -832,8 +832,8 @@ int mc_db_parse_and_update_db(uid_t uid, const char *data, int data_size)
                list_len = g_list_length(query_list);
                if (list_len < 3) {
                        mc_error("invalid query_list len [%d]", list_len);
-                       ret = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-                       goto ERROR;
+                       g_strfreev(params);
+                       return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
                }
 
                for (i = 2; i < list_len; i++) {
@@ -862,10 +862,10 @@ int mc_db_parse_and_update_db(uid_t uid, const char *data, int data_size)
                        sql_str = sqlite3_mprintf("UPDATE '%q' SET icon_uri=NULL;", params[1]);
 
        } else if (strncmp(MC_DB_CMD_UPDATE_ABILITY, params[0], strlen(MC_DB_CMD_UPDATE_ABILITY)) == 0) {
-               if (params[2] == NULL || params[3] == NULL) {
+               if (!params[2] || !params[3]) {
                        mc_error("invalid query");
-                       ret = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-                       goto ERROR;
+                       g_strfreev(params);
+                       return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
                }
 
                mc_safe_strtoull(params[2], &llu_value);
@@ -874,29 +874,21 @@ int mc_db_parse_and_update_db(uid_t uid, const char *data, int data_size)
                sql_str = sqlite3_mprintf("UPDATE '%q' SET ability_decided=%llu, ability_supported=%llu;", params[1], llu_value, llu_value2);
 
        } else if (strncmp(MC_DB_CMD_REMOVE_PLAYLIST, params[0], strlen(MC_DB_CMD_REMOVE_PLAYLIST)) == 0) {
-               if (params[2] == NULL) {
+               if (!params[2]) {
                        mc_error("invalid query");
-                       ret = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-                       goto ERROR;
+                       g_strfreev(params);
+                       return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
                }
 
                sql_str = sqlite3_mprintf("DELETE FROM '%q' WHERE server_name='%q' and playlist_name=%Q;", MC_DB_TABLE_PLAYLIST, params[1], params[2]);
 
        } else {
-               mc_error("invalid request");
-               ret = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-               goto ERROR;
-       }
-
-       if (sql_str == NULL) {
-               mc_error("sql_str is NULL");
-               ret = MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY;
-               goto ERROR;
+               mc_error("invalid request [%s]", params[0]);
+               g_strfreev(params);
+               return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
        }
 
-ERROR:
-
-       if (sql_str != NULL) {
+       if (sql_str) {
                ret = mc_db_connect(&_db_handle, uid, TRUE);
                if (ret != MEDIA_CONTROLLER_ERROR_NONE)
                        mc_error("mc_db_connect error : %d", ret);
@@ -922,6 +914,9 @@ ERROR:
 
                SQLITE3_SAFE_FREE(sql_str);
 
+       } else {
+               mc_error("sql_str is NULL");
+               ret = MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY;
        }
 
        g_strfreev(params);