From fd97a0e199990a937e96481e6c5c702ec2a85955 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Tue, 11 Jun 2024 15:39:20 +0900 Subject: [PATCH] Use g_auto(GStrv) Change-Id: I5a805f1614e1fc95b26ec47a6500f660eed8d3b2 Signed-off-by: Minje Ahn --- src/media_controller_client.c | 41 ++++++---------------- src/media_controller_metadata.c | 5 +-- src/media_controller_server.c | 75 +++++++---------------------------------- svc/media_controller_db_util.c | 18 ++++------ 4 files changed, 29 insertions(+), 110 deletions(-) diff --git a/src/media_controller_client.c b/src/media_controller_client.c index a42a71a..9259c74 100644 --- a/src/media_controller_client.c +++ b/src/media_controller_client.c @@ -59,7 +59,7 @@ static mc_cb_event_s cb_event[MC_CLIENT_EVENT_MAX] = { static void __client_server_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; mc_retm_if_failed(receiver && receiver->callback); @@ -71,8 +71,6 @@ static void __client_server_cb(const char *interface_name, const char *signal_na mc_retm_if_failed(params); callback(params[0], (mc_server_state_e)atoi(params[1]), receiver->user_data); - - g_strfreev(params); } static void __client_playback_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) @@ -119,7 +117,7 @@ static void __client_metadata_cb(const char *interface_name, const char *signal_ static void __client_shuffle_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; mc_retm_if_failed(receiver && receiver->callback); @@ -132,13 +130,11 @@ static void __client_shuffle_cb(const char *interface_name, const char *signal_n mc_retm_if_failed(params); callback(params[0], (mc_shuffle_mode_e)atoi(params[1]), receiver->user_data); - - g_strfreev(params); } static void __client_repeat_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; mc_retm_if_failed(receiver && receiver->callback); @@ -151,13 +147,11 @@ static void __client_repeat_cb(const char *interface_name, const char *signal_na mc_retm_if_failed(params); callback(params[0], (mc_repeat_mode_e)atoi(params[1]), receiver->user_data); - - g_strfreev(params); } static void __client_playlist_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; mc_playlist_update_mode_e mode = MC_PLAYLIST_UPDATED; mc_playlist_s *_playlist = NULL; @@ -181,7 +175,6 @@ static void __client_playlist_cb(const char *interface_name, const char *signal_ callback(params[0], mode, params[2], (mc_playlist_h)_playlist, receiver->user_data); - g_strfreev(params); mc_playlist_destroy((mc_playlist_h)_playlist); return; @@ -189,7 +182,7 @@ static void __client_playlist_cb(const char *interface_name, const char *signal_ static void __client_cmd_reply_received_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; int result_code = 0; int enc_size = 0; bundle *bundle_data = NULL; @@ -215,13 +208,11 @@ static void __client_cmd_reply_received_cb(const char *interface_name, const cha bundle_data = bundle_decode((bundle_raw *)params[3], enc_size); callback(params[0], request_id, result_code, bundle_data, receiver->user_data); - - g_strfreev(params); } static void __client_custom_event_received_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; int enc_size = 0; char *sender = NULL; char *command = NULL; @@ -243,7 +234,6 @@ static void __client_custom_event_received_cb(const char *interface_name, const if (_mc_util_get_command_available(MC_PRIV_TYPE_CLIENT, sender, MC_EVENT_CUSTOM, params[1]) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); g_free(sender); - g_strfreev(params); return; } @@ -256,8 +246,6 @@ static void __client_custom_event_received_cb(const char *interface_name, const g_free(sender); g_free(command); - - g_strfreev(params); } static void __client_playback_ability_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) @@ -283,7 +271,7 @@ static void __client_playback_ability_cb(const char *interface_name, const char static void __client_ability_support_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; mc_retm_if_failed(receiver && receiver->callback); @@ -295,8 +283,6 @@ static void __client_ability_support_cb(const char *interface_name, const char * mc_retm_if_failed(params); callback(params[0], (mc_ability_e)atoi(params[1]), (mc_ability_support_e)atoi(params[2]), receiver->user_data); - - g_strfreev(params); } static void __client_display_mode_ability_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) @@ -336,12 +322,11 @@ static void __client_display_rotation_ability_cb(const char *interface_name, con mc_error("Fail to _mc_db_get_display_rotation_ability"); callback(message, ability, receiver->user_data); - } static void __client_attribute_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; mc_retm_if_failed(receiver && receiver->callback); @@ -353,13 +338,11 @@ static void __client_attribute_cb(const char *interface_name, const char *signal mc_retm_if_failed(params); callback(params[0], atoi(params[1]), receiver->user_data); - - g_strfreev(params); } static void __client_display_mode_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; mc_retm_if_failed(receiver && receiver->callback); @@ -371,13 +354,11 @@ static void __client_display_mode_cb(const char *interface_name, const char *sig mc_retm_if_failed(params); callback(params[0], (mc_display_mode_e)atoi(params[1]), receiver->user_data); - - g_strfreev(params); } static void __client_display_rotation_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; mc_retm_if_failed(receiver && receiver->callback); @@ -389,8 +370,6 @@ static void __client_display_rotation_cb(const char *interface_name, const char mc_retm_if_failed(params); callback(params[0], (mc_display_rotation_e)atoi(params[1]), receiver->user_data); - - g_strfreev(params); } static int __mc_client_create(media_controller_client_s **mc_client) diff --git a/src/media_controller_metadata.c b/src/media_controller_metadata.c index c1c523f..8d5ff60 100644 --- a/src/media_controller_metadata.c +++ b/src/media_controller_metadata.c @@ -501,7 +501,7 @@ int _parse_encoded_meta(mc_meta_e attribute, const char *encoded_meta, int *int_ int ret = MEDIA_CONTROLLER_ERROR_NONE; gsize out_len = 0; guchar *_decoded_meta = NULL; - gchar **params = NULL; + g_auto(GStrv) params = NULL; int _int_val_1 = 0; int _int_val_2 = 0; @@ -522,7 +522,6 @@ int _parse_encoded_meta(mc_meta_e attribute, const char *encoded_meta, int *int_ mc_retvm_if(params == NULL, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "parsing fail"); if ((params[0] == NULL) || (params[1] == NULL) || (params[2] == NULL)) { - g_strfreev(params); mc_error("wrong parameter"); return MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER; } @@ -555,8 +554,6 @@ int _parse_encoded_meta(mc_meta_e attribute, const char *encoded_meta, int *int_ ret = MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER; } - g_strfreev(params); - return ret; } diff --git a/src/media_controller_server.c b/src/media_controller_server.c index 8e5d989..d8c2083 100644 --- a/src/media_controller_server.c +++ b/src/media_controller_server.c @@ -146,7 +146,7 @@ static int __mc_server_destoy(media_controller_server_s *mc_server) static void __server_playback_action_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; @@ -161,24 +161,20 @@ static void __server_playback_action_cb(const char *interface_name, const char * if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_PLAYBACKACTION, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); - g_strfreev(params); return; } if (mc_safe_strtoi(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error get received value"); - g_strfreev(params); return; } callback(params[0], request_id, (mc_playback_action_e)value, receiver->user_data); - - g_strfreev(params); } static void __server_playback_position_cmd_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; unsigned long long value = 0; @@ -193,24 +189,20 @@ static void __server_playback_position_cmd_cb(const char *interface_name, const if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_PLAYBACKPOSITION, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); - g_strfreev(params); return; } if (mc_safe_strtoull(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error get received value"); - g_strfreev(params); return; } callback(params[0], request_id, value, receiver->user_data); - - g_strfreev(params); } static void __server_shuffle_mode_cmd_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; @@ -225,24 +217,20 @@ static void __server_shuffle_mode_cmd_cb(const char *interface_name, const char if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_SHUFFLE, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); - g_strfreev(params); return; } if (mc_safe_strtoi(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error get received value"); - g_strfreev(params); return; } callback(params[0], request_id, (mc_shuffle_mode_e)value, receiver->user_data); - - g_strfreev(params); } static void __server_repeat_mode_cmd_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; @@ -257,24 +245,20 @@ static void __server_repeat_mode_cmd_cb(const char *interface_name, const char * if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_REPEAT, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); - g_strfreev(params); return; } if (mc_safe_strtoi(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error get received value"); - g_strfreev(params); return; } callback(params[0], request_id, (mc_repeat_mode_e)value, receiver->user_data); - - g_strfreev(params); } static void __server_play_playlist_cmd_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int action = 0; unsigned long long position = 0; @@ -290,30 +274,25 @@ static void __server_play_playlist_cmd_cb(const char *interface_name, const char if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_PLAY_PLAYLIST, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); - g_strfreev(params); return; } if (mc_safe_strtoi(params[3], &action) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error get received action value"); - g_strfreev(params); return; } if (mc_safe_strtoull(params[4], &position) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error get received position value"); - g_strfreev(params); return; } callback(params[0], request_id, params[1], params[2], (mc_playback_action_e)action, position, receiver->user_data); - - g_strfreev(params); } static void __server_custom_cmd_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; int enc_size = 0; char *sender = NULL; char *command = NULL; @@ -335,7 +314,6 @@ static void __server_custom_cmd_cb(const char *interface_name, const char *signa if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, sender, MC_COMMAND_CUSTOMACTION, params[1]) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); g_free(sender); - g_strfreev(params); return; } @@ -348,13 +326,11 @@ static void __server_custom_cmd_cb(const char *interface_name, const char *signa g_free(sender); g_free(command); - - g_strfreev(params); } static void __server_event_reply_received_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; int result_code = 0; int enc_size = 0; bundle *bundle_data = NULL; @@ -379,15 +355,13 @@ static void __server_event_reply_received_cb(const char *interface_name, const c bundle_data = bundle_decode((bundle_raw *)params[3], enc_size); callback(params[0], request_id, result_code, bundle_data, receiver->user_data); - - g_strfreev(params); } static void __search_cb(const char *key, const int type, const bundle_keyval_t *kv, void *user_data) { void *basic_val = NULL; size_t basic_size = 0; - gchar **params = NULL; + g_auto(GStrv) params = NULL; int content_type = 0; int category = 0; char *keyword = NULL; @@ -405,19 +379,16 @@ static void __search_cb(const char *key, const int type, const bundle_keyval_t if (mc_safe_strtoi(params[0], &content_type) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error get content_type"); - g_strfreev(params); return; } if (mc_safe_strtoi(params[1], &category) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error get category"); - g_strfreev(params); return; } if (mc_safe_strtoi(params[3], &bundle_size) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error get bundle_size"); - g_strfreev(params); return; } @@ -428,8 +399,6 @@ static void __search_cb(const char *key, const int type, const bundle_keyval_t if (bundle_size > 0) bundle_data = bundle_decode((bundle_raw *)params[4], bundle_size); - g_strfreev(params); - search_item = g_new0(mc_search_item_s, 1); search_item->content_type = content_type; @@ -442,7 +411,7 @@ static void __search_cb(const char *key, const int type, const bundle_keyval_t static void __server_search_cmd_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; int enc_size = 0; bundle *bundle_data = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; @@ -459,19 +428,16 @@ static void __server_search_cmd_cb(const char *interface_name, const char *signa if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_SEARCH, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); - g_strfreev(params); return; } if (mc_safe_strtoi(params[1], &enc_size) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error get received search cmd"); - g_strfreev(params); return; } if (enc_size == 0) { mc_error("Invalid search cmd"); - g_strfreev(params); return; } @@ -479,7 +445,6 @@ static void __server_search_cmd_cb(const char *interface_name, const char *signa if (bundle_data == NULL) { mc_error("Error when get data. data is NULL"); - g_strfreev(params); return; } @@ -491,14 +456,12 @@ static void __server_search_cmd_cb(const char *interface_name, const char *signa callback(params[0], request_id, (mc_search_h)mc_search, receiver->user_data); - g_strfreev(params); - mc_search_destroy((mc_search_h)mc_search); } static void __server_enable_cmd_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; @@ -515,35 +478,29 @@ static void __server_enable_cmd_cb(const char *interface_name, const char *signa if (!strncmp(signal_name, MC_DBUS_SIGNAL_NAME_SUBTITLES, strlen(MC_DBUS_SIGNAL_NAME_SUBTITLES))) { if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_SUBTITLES, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied for subtitles"); - g_strfreev(params); return; } } else if (!strncmp(signal_name, MC_DBUS_SIGNAL_NAME_360, strlen(MC_DBUS_SIGNAL_NAME_360))) { if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_360, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied for 360"); - g_strfreev(params); return; } } else { mc_secure_error("Invalid signal_name [%s]", signal_name); - g_strfreev(params); return; } if (mc_safe_strtoi(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error get received value"); - g_strfreev(params); return; } callback(params[0], request_id, value, receiver->user_data); - - g_strfreev(params); } static void __server_display_mode_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; @@ -559,24 +516,20 @@ static void __server_display_mode_cb(const char *interface_name, const char *sig if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_DISPLAYMODE, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); - g_strfreev(params); return; } if (mc_safe_strtoi(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error get received value"); - g_strfreev(params); return; } callback(params[0], request_id, (mc_display_mode_e)value, receiver->user_data); - - g_strfreev(params); } static void __server_display_rotation_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { - gchar **params = NULL; + g_auto(GStrv) params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; @@ -592,19 +545,15 @@ static void __server_display_rotation_cb(const char *interface_name, const char if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_DISPLAYROTATION, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); - g_strfreev(params); return; } if (mc_safe_strtoi(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error get received value"); - g_strfreev(params); return; } callback(params[0], request_id, (mc_display_rotation_e)value, receiver->user_data); - - g_strfreev(params); } static int __mc_server_send_message(media_controller_server_s *mc_server, const char *interface_name, const char *signal_name, const int param1, const int param2, const char* param3) diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c index ecbb490..9ffdd74 100644 --- a/svc/media_controller_db_util.c +++ b/svc/media_controller_db_util.c @@ -547,7 +547,7 @@ static void __make_playlist_query_cb(const char *key, const int type, const bun { void *basic_val = NULL; size_t basic_size = 0; - gchar **params = NULL; + g_auto(GStrv) params = NULL; playlist_query_s *query = (playlist_query_s *)user_data; mc_retm_if_failed(key); @@ -568,8 +568,6 @@ static void __make_playlist_query_cb(const char *key, const int type, const bun __replace_null(params[1]), __replace_null(params[2]), __replace_null(params[3]), __replace_null(params[4]), __replace_null(params[5]), __replace_null(params[6]), __replace_null(params[7]), __replace_null(params[8]), __replace_null(params[9]), __replace_null(params[10]), __replace_null(params[11]), __replace_null(params[12]), __replace_null(params[13]), __replace_null(params[14])); - - g_strfreev(params); } int __read_message_from_file(const gchar *path, gchar **data, size_t *size) @@ -634,7 +632,7 @@ static int __parse_db_request(gchar **params, char **sql_str) } else if (strncmp(MC_DB_CMD_UPDATE_META, params[0], strlen(MC_DB_CMD_UPDATE_META)) == 0) { gchar *message = NULL; size_t message_size = 0; - gchar **meta_params = NULL; + g_auto(GStrv) meta_params = NULL; mc_retvm_if((__read_message_from_file(params[1], &message, &message_size) != MEDIA_CONTROLLER_ERROR_NONE), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "__read_message_from_file failed"); @@ -649,9 +647,8 @@ static int __parse_db_request(gchar **params, char **sql_str) __replace_null(meta_params[4]), __replace_null(meta_params[5]), __replace_null(meta_params[6]), __replace_null(meta_params[7]), __replace_null(meta_params[8]), __replace_null(meta_params[9]), __replace_null(meta_params[10]), __replace_null(meta_params[11]), __replace_null(meta_params[12]), - __replace_null(meta_params[13]), __replace_null(meta_params[14])); + __replace_null(meta_params[13]), __replace_null(meta_params[14]));\ - g_strfreev(meta_params); } else if (strncmp(MC_DB_CMD_UPDATE_SHUFFLE, params[0], strlen(MC_DB_CMD_UPDATE_SHUFFLE)) == 0) { mc_retvm_if(!params[2], MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "invalid query"); @@ -795,7 +792,7 @@ static int __update_db_request(uid_t uid, gchar **params, const char *sql_str) int mc_db_request(uid_t uid, const char *data, int data_size) { int ret = MEDIA_CONTROLLER_ERROR_NONE; - gchar **params = NULL; + g_auto(GStrv) params = NULL; sql_autoptr q = NULL; mc_retvm_if(!data, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid data"); @@ -805,12 +802,9 @@ int mc_db_request(uid_t uid, const char *data, int data_size) mc_retvm_if(!params, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "fail to parsing query"); ret = __parse_db_request(params, &q); - if (ret == MEDIA_CONTROLLER_ERROR_NONE) { - ret = __update_db_request(uid, params, q); - } - g_strfreev(params); + mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to make query"); - return ret; + return __update_db_request(uid, params, q); } int mc_db_add_application(uid_t uid, const char *app_id, const mc_priv_type_e priv_type) -- 2.7.4