Remove duplicated code and redundant parameter

Change-Id: I8abe4d8d6eb0f59b6887393126d640bb034bdf24

diff --git a/src/media_controller_client.c b/src/media_controller_client.c
index 9d246e8..d614757 100644 (file)
--- a/src/media_controller_client.c
+++ b/src/media_controller_client.c
@@ -345,7 +345,7 @@ static void __client_ability_support_cb(const char *interface_name, const char *
        mc_retm_if(callback == NULL, "callback is NULL");
        mc_retm_if(message == NULL, "message is NULL");
 
-       mc_secure_debug("__client_ability_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__client_ability_support_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid ability data");
@@ -1102,132 +1102,95 @@ int mc_client_get_latest_server_info(mc_client_h client, char **server_name, mc_
        return ret;
 }
 
-int mc_client_get_server_playback_info(mc_client_h client, const char *server_name, mc_playback_h *playback)
+static gboolean __is_valid_parameter(mc_client_h client, const char *server_name)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(mc_client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-       mc_retvm_if(playback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "playback Handle is NULL");
-       mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
+       mc_retvm_if(!mc_client, FALSE, "Invalid client");
+       mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), FALSE, "Invalid server_name");
 
-       ret = mc_db_get_playback_info(mc_client->db_handle, server_name, playback);
-       mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail mc_db_get_playback_info [%d]", ret);
+       return TRUE;
+}
 
-       return ret;
+int mc_client_get_server_playback_info(mc_client_h client, const char *server_name, mc_playback_h *playback)
+{
+       media_controller_client_s *mc_client = (media_controller_client_s *)client;
+
+       mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       return mc_db_get_playback_info(mc_client->db_handle, server_name, playback);
 }
 
 int mc_client_get_server_metadata(mc_client_h client, const char *server_name, mc_metadata_h *metadata)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(mc_client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-       mc_retvm_if(metadata == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "metadata Handle is NULL");
-       mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
-
-       ret = mc_db_get_metadata_info(mc_client->db_handle, server_name, metadata);
-       mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail mc_db_get_metadata_info [%d]", ret);
+       mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
-       return ret;
+       return mc_db_get_metadata_info(mc_client->db_handle, server_name, metadata);
 }
 
 int mc_client_get_server_shuffle_mode(mc_client_h client, const char *server_name, mc_shuffle_mode_e *mode)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(mc_client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-       mc_retvm_if(mode == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "mode is NULL");
-       mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
-
-       ret = mc_db_get_shuffle_mode(mc_client->db_handle, server_name, mode);
+       mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
-       return ret;
+       return mc_db_get_shuffle_mode(mc_client->db_handle, server_name, mode);
 }
 
 int mc_client_get_server_repeat_mode(mc_client_h client, const char *server_name, mc_repeat_mode_e *mode)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(mc_client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-       mc_retvm_if(mode == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "mode is NULL");
-       mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
-
-       ret = mc_db_get_repeat_mode(mc_client->db_handle, server_name, mode);
+       mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
-       return ret;
+       return mc_db_get_repeat_mode(mc_client->db_handle, server_name, mode);
 }
 
 int mc_client_get_server_icon(mc_client_h client, const char *server_name, char **uri)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(mc_client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-       mc_retvm_if(uri == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "uri is NULL");
-       mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
-
-       ret = mc_db_get_icon_uri(mc_client->db_handle, server_name, uri);
+       mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
-       return ret;
+       return mc_db_get_icon_uri(mc_client->db_handle, server_name, uri);
 }
 
 int mc_client_get_server_subtitles_enabled(mc_client_h client, const char *server_name, bool *enabled)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(!mc_client, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid client");
-       mc_retvm_if(!enabled, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid enabled");
-       mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
-
-       ret = _mc_db_get_subtitles_enabled(mc_client->db_handle, server_name, enabled);
+       mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
-       return ret;
+       return _mc_db_get_subtitles_enabled(mc_client->db_handle, server_name, enabled);
 }
 
 int mc_client_get_server_360_mode_enabled(mc_client_h client, const char *server_name, bool *enabled)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(!mc_client, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid client");
-       mc_retvm_if(!enabled, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid enabled");
-       mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
+       mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
-       ret = _mc_db_get_360_mode_enabled(mc_client->db_handle, server_name, enabled);
-
-       return ret;
+       return _mc_db_get_360_mode_enabled(mc_client->db_handle, server_name, enabled);
 }
 
 int mc_client_get_server_display_mode(mc_client_h client, const char *server_name, mc_display_mode_e *mode)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(!mc_client, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid client");
-       mc_retvm_if(!mode, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid mode");
-       mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
-
-       ret = _mc_db_get_display_mode(mc_client->db_handle, server_name, mode);
+       mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
-       return ret;
+       return _mc_db_get_display_mode(mc_client->db_handle, server_name, mode);
 }
 
 int mc_client_get_server_display_rotation(mc_client_h client, const char *server_name, mc_display_rotation_e *rotation)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(!mc_client, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid client");
-       mc_retvm_if(!rotation, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid rotation");
-       mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
+       mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
-       ret = _mc_db_get_display_rotation(mc_client->db_handle, server_name, rotation);
-
-       return ret;
+       return _mc_db_get_display_rotation(mc_client->db_handle, server_name, rotation);
 }
 
 int mc_client_foreach_server_playlist(mc_client_h client, const char *server_name, mc_playlist_cb callback, void *user_data)
@@ -1281,7 +1244,6 @@ int mc_client_send_playback_action_cmd(mc_client_h client, const char *server_na
        char *message = NULL;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(!mc_client, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle");
        mc_retvm_if(!_mc_util_is_valid_playback_action(action), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid action");
 
        ret = __mc_client_verify_ability(client, server_name, PLAYBACK_ACTION_ABILITY + action);
@@ -1303,9 +1265,6 @@ int mc_client_send_playback_position_cmd(mc_client_h client, const char *server_
        char *message = NULL;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(mc_client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-       mc_retvm_if(!MC_STRING_VALID(server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
-
        ret = __mc_client_verify_ability(client, server_name, MC_ABILITY_PLAYBACK_POSITION);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to verify ability");
 
@@ -1454,8 +1413,6 @@ int mc_client_send_playlist_cmd(mc_client_h client, const char *server_name, con
        char *message = NULL;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(mc_client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-       mc_retvm_if(!MC_STRING_VALID(server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
        mc_retvm_if(!MC_STRING_VALID(playlist_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid playlist_name");
        mc_retvm_if(!MC_STRING_VALID(index), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid index");
        mc_retvm_if(!_mc_util_is_valid_playback_action(action), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid action");
@@ -1480,9 +1437,6 @@ int mc_client_send_custom_cmd(mc_client_h client, const char *server_name, const
        char *bundle_str = NULL;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(mc_client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-       mc_retvm_if(!MC_STRING_VALID(server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
-
        ret = __mc_client_verify_ability(client, server_name, MC_ABILITY_CLIENT_CUSTOM);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to verify ability");
 
@@ -1595,10 +1549,6 @@ int mc_client_send_search_cmd(mc_client_h client, const char *server_name, mc_se
 
        mc_debug_fenter();
 
-       mc_retvm_if(mc_client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-       mc_retvm_if(!MC_STRING_VALID(server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
-       mc_retvm_if(!_mc_db_is_activated_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
-
        ret = __mc_client_verify_ability(client, server_name, MC_ABILITY_SEARCH);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to verify ability");
 
@@ -1651,32 +1601,21 @@ int mc_client_send_event_reply(mc_client_h client, const char *server_name, cons
 
 int mc_client_get_server_playback_ability(mc_client_h client, const char *server_name, mc_playback_ability_h *ability)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "client is NULL");
-       mc_retvm_if(ability == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "ability is NULL");
-       mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
+       mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
-       ret = mc_db_get_pb_action_ability(mc_client->db_handle, server_name, ability);
-       mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error mc_db_get_pb_action_ability [%d]", ret);
-
-       return ret;
+       return mc_db_get_pb_action_ability(mc_client->db_handle, server_name, ability);
 }
 
 static int __mc_client_get_server_ability(mc_client_h client, const char *server_name, mc_ability_e ability, mc_ability_support_e *support)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(!client, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid client");
-       mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
+       mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter");
        mc_retvm_if(((ability < MC_ABILITY_SHUFFLE) || (ability > MC_ABILITY_360_MODE)) , MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid ability [%d]", ability);
 
-       ret = mc_db_get_ability_supported(mc_client->db_handle, server_name, ability, support);
-       mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error mc_db_get_ability_supported [%d]", ret);
-
-       return ret;
+       return mc_db_get_ability_supported(mc_client->db_handle, server_name, ability, support);
 }
 
 int mc_client_get_server_shuffle_ability_support(mc_client_h client, const char *server_name, mc_ability_support_e *support)
@@ -1702,8 +1641,7 @@ int mc_client_get_server_display_mode_ability(mc_client_h client, const char *se
 {
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(!client, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid client");
-       mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
+       mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
        return _mc_db_get_display_mode_ability(mc_client->db_handle, server_name, supported_modes);
 }
@@ -1712,8 +1650,7 @@ int mc_client_get_server_display_rotation_ability(mc_client_h client, const char
 {
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
-       mc_retvm_if(!client, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid client");
-       mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
+       mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
        return _mc_db_get_display_rotation_ability(mc_client->db_handle, server_name, supported_rotations);
 }

diff --git a/src/media_controller_server.c b/src/media_controller_server.c
index 051c006..cee96ad 100644 (file)
--- a/src/media_controller_server.c
+++ b/src/media_controller_server.c
@@ -810,7 +810,6 @@ int mc_server_set_playlist_item_info(mc_server_h server, const char *playlist_na
 
 int mc_server_set_playback_content_type(mc_server_h server, mc_content_type_e content_type)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_server_s *mc_server = (media_controller_server_s *)server;
 
        mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
@@ -820,12 +819,11 @@ int mc_server_set_playback_content_type(mc_server_h server, mc_content_type_e co
 
        mc_server->playback.content_type = content_type;
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_server_set_content_age_rating(mc_server_h server, mc_content_age_rating_e age_rating)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_server_s *mc_server = (media_controller_server_s *)server;
 
        mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
@@ -835,7 +833,7 @@ int mc_server_set_content_age_rating(mc_server_h server, mc_content_age_rating_e
 
        mc_server->playback.age_rating = age_rating;
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_server_update_playback_info(mc_server_h server)
@@ -1070,7 +1068,6 @@ int mc_server_delete_playlist(mc_server_h server, mc_playlist_h playlist)
 
 int mc_server_foreach_playlist(mc_server_h server, mc_playlist_cb callback, void *user_data)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_server_s *mc_server = (media_controller_server_s *)server;
 
        mc_warning("DEPRECATION WARNING: mc_server_foreach_playlist() is deprecated and will be removed from next release. Use mc_playlist_foreach_playlist() instead.");
@@ -1078,9 +1075,7 @@ int mc_server_foreach_playlist(mc_server_h server, mc_playlist_cb callback, void
        mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid server");
        mc_retvm_if(callback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid callback");
 
-       ret = mc_db_get_foreach_playlist(mc_server->db_handle, mc_server->server_name, callback, user_data);
-
-       return ret;
+       return mc_db_get_foreach_playlist(mc_server->db_handle, mc_server->server_name, callback, user_data);
 }
 
 static int __mc_server_set_ability(mc_server_h server, mc_ability_e ability, mc_ability_support_e support)
@@ -1302,15 +1297,12 @@ int mc_server_send_cmd_reply(mc_server_h server, const char *client_name, const
 
 int mc_server_foreach_client(mc_server_h server, mc_activated_client_cb callback, void *user_data)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_server_s *mc_server = (media_controller_server_s *)server;
 
        mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(callback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "callback is NULL");
 
-       ret = mc_db_foreach_client_list(mc_server->db_handle, callback, user_data);
-
-       return ret;
+       return mc_db_foreach_client_list(mc_server->db_handle, callback, user_data);
 }
 
 int mc_server_send_custom_event(mc_server_h server, const char *client_name, const char *event, bundle *data, char **request_id)
@@ -1340,17 +1332,13 @@ int mc_server_send_custom_event(mc_server_h server, const char *client_name, con
 
 int mc_server_set_icon(mc_server_h server, const char *uri)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_server_s *mc_server = (media_controller_server_s *)server;
 
        mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
 
        mc_debug("uri %s", uri);
 
-       ret = mc_db_update_icon_uri(mc_server->server_name, uri);
-       mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to mc_db_update_icon_uri");
-
-       return ret;
+       return mc_db_update_icon_uri(mc_server->server_name, uri);
 }
 
 static int __mc_server_update_ability(mc_server_h server, int support_item, mc_ability_support_e support, gboolean immediate_update)