Code clean up regarding the return value

Change-Id: Ic33390455a90e7649a6d00a5b0870ac99452495f

diff --git a/src/media_controller_client.c b/src/media_controller_client.c
index 63870f013f8bee10462336bd4cdcbb01581ae15c..07d92d54afd8bafb9119a802627ce4a57b2cf549 100644 (file)
--- a/src/media_controller_client.c
+++ b/src/media_controller_client.c
@@ -526,10 +526,9 @@ static int __mc_client_send_command(mc_client_h client, const char *server_name,
        interface_name = _mc_util_get_interface_name(MC_SERVER, server_name);
 
        ret = _mc_ipc_send_message(mc_client->dconn, NULL, interface_name, signal_name, message, request_id);
-       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("Error _mc_ipc_send_message [%d]", ret);
+       mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to _mc_ipc_send_message [%d]", ret);
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_client_create(mc_client_h *client)
@@ -786,21 +785,19 @@ int mc_client_subscribe(mc_client_h client, const mc_subscription_type_e subscri
        mc_retvm_if(mc_client->updated_cb[subscription_type].callback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid callback");
 
        ret = _mc_ipc_unregister_listener(&mc_client->listeners, MC_DBUS_UPDATE_INTERFACE, cb_event[subscription_type].signal_name);
+       mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to _mc_ipc_unregister_listener [%d]", ret);
 
        if (subscription_type == MC_SUBSCRIPTION_TYPE_METADATA || subscription_type == MC_SUBSCRIPTION_TYPE_PLAYBACK_ABILITY
                || subscription_type == MC_SUBSCRIPTION_TYPE_DISPLAY_MODE_ABILITY || subscription_type == MC_SUBSCRIPTION_TYPE_DISPLAY_ROTATION_ABILITY) {
                mc_client->updated_cb[subscription_type].db_handle = mc_client->db_handle;
        }
 
-       ret = __mc_client_register_filter_listener(mc_client, &mc_client->updated_cb[subscription_type].filter_list, server_name, cb_event[subscription_type].signal_name,
+       return __mc_client_register_filter_listener(mc_client, &mc_client->updated_cb[subscription_type].filter_list, server_name, cb_event[subscription_type].signal_name,
                                cb_event[subscription_type].cb_func, (void *)&(mc_client->updated_cb[subscription_type]));
-
-       return ret;
 }
 
 int mc_client_unsubscribe(mc_client_h client, const mc_subscription_type_e subscription_type, 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");
@@ -810,14 +807,11 @@ int mc_client_unsubscribe(mc_client_h client, const mc_subscription_type_e subsc
        mc_retvm_if(mc_client->updated_cb[subscription_type].callback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid callback. No list to unsubscribe [%d]", subscription_type);
        mc_retvm_if(mc_client->updated_cb[subscription_type].filter_list == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid filter_list. No list to unsubscribe [%d]", subscription_type);
 
-       ret = __mc_client_unregister_filter_listener(mc_client, &mc_client->updated_cb[subscription_type].filter_list, server_name, cb_event[subscription_type].signal_name);
-
-       return ret;
+       return __mc_client_unregister_filter_listener(mc_client, &mc_client->updated_cb[subscription_type].filter_list, server_name, cb_event[subscription_type].signal_name);
 }
 
 int mc_client_foreach_server_subscribed(mc_client_h client, const mc_subscription_type_e subscription_type, mc_subscribed_server_cb callback, void *user_data)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
        GList *iter = NULL;
 
@@ -835,7 +829,7 @@ int mc_client_foreach_server_subscribed(mc_client_h client, const mc_subscriptio
                        break;
        }
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_client_get_playback_state(mc_playback_h playback, mc_playback_states_e *state)
@@ -1030,15 +1024,12 @@ int mc_client_get_server_display_rotation(mc_client_h client, const char *server
 
 int mc_client_foreach_server(mc_client_h client, mc_activated_server_cb callback, void *user_data)
 {
-       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(callback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "callback is NULL");
 
-       ret = _mc_db_foreach_server_list(mc_client->db_handle, callback, user_data);
-
-       return ret;
+       return _mc_db_foreach_server_list(mc_client->db_handle, callback, user_data);
 }
 
 static int __mc_client_verify_ability(mc_client_h client, const char *server_name, int ability)
@@ -1343,7 +1334,7 @@ static int __mc_client_get_bundle_from_search(mc_search_h search, bundle **res_b
 
        *res_bundle = bundle_data;
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 
 ERROR:
        bundle_free(bundle_data);
@@ -1404,10 +1395,9 @@ int mc_client_send_event_reply(mc_client_h client, const char *server_name, cons
 
        interface_name = _mc_util_get_interface_name(MC_SERVER, server_name);
        ret = _mc_ipc_send_reply(mc_client->dconn, NULL, interface_name, MC_DBUS_SIGNAL_NAME_EVENT_REPLY, message, request_id);
-       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("Error _mc_ipc_send_message [%d]", ret);
+       mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to _mc_ipc_send_message [%d]", ret);
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_client_get_server_playback_ability(mc_client_h client, const char *server_name, mc_playback_ability_h *ability)

diff --git a/src/media_controller_db.c b/src/media_controller_db.c
index b3c632c079a1070f9d20c0640c025e7f5481f6ef..4ad228cb6e5c5aec3865cab4811b6db94681b0b7 100644 (file)
--- a/src/media_controller_db.c
+++ b/src/media_controller_db.c
@@ -85,7 +85,7 @@ static int __mc_db_get_bool_value(sqlite3 *handle, const char *server_name, cons
 
        *value = (bool)int_val;
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 static void __mc_db_playlist_destroy(gpointer data)
@@ -407,7 +407,7 @@ int _mc_db_get_ability_supported(sqlite3 *handle, const char *server_name, int a
 
        mc_secure_debug("ability: %d supported: %d", ability, *supported);
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int _mc_db_get_pb_action_ability(sqlite3 *handle, const char *server_name, mc_playback_ability_h *ability)
@@ -429,7 +429,7 @@ int _mc_db_get_pb_action_ability(sqlite3 *handle, const char *server_name, mc_pl
 
        *ability = (mc_playback_ability_h)basic_ability;
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int _mc_db_get_display_mode_ability(sqlite3 *handle, const char *server_name, unsigned int *ability)
@@ -458,7 +458,7 @@ int _mc_db_get_display_mode_ability(sqlite3 *handle, const char *server_name, un
 
        *ability = _ability;
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int _mc_db_get_display_rotation_ability(sqlite3 *handle, const char *server_name, unsigned int *ability)
@@ -487,7 +487,7 @@ int _mc_db_get_display_rotation_ability(sqlite3 *handle, const char *server_name
 
        *ability = _ability;
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int _mc_db_get_playlist_count(sqlite3 *handle, const char *server_name)

diff --git a/src/media_controller_metadata.c b/src/media_controller_metadata.c
index 221cb570d084bc1cdc0924bcfe1e1fa485109e06..458cf6253ed2782178b9b4fd9aa1d7521966d86a 100644 (file)
--- a/src/media_controller_metadata.c
+++ b/src/media_controller_metadata.c
@@ -116,7 +116,6 @@ int _mc_metadata_set(mc_metadata_h metadata, mc_meta_e attribute, const char *va
 
 int mc_metadata_clone(mc_metadata_h src, mc_metadata_h *dst)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_metadata_s *_src = (media_controller_metadata_s *)src;
        media_controller_metadata_s *_dst = NULL;
 
@@ -142,7 +141,7 @@ int mc_metadata_clone(mc_metadata_h src, mc_metadata_h *dst)
 
        *dst = (mc_metadata_h)_dst;
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_metadata_destroy(mc_metadata_h metadata)
@@ -252,7 +251,6 @@ int mc_metadata_get(mc_metadata_h metadata, mc_meta_e attribute, char **value)
 
 int mc_playback_ability_clone(mc_playback_ability_h src, mc_playback_ability_h *dst)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_ability_s *_src = (media_controller_ability_s *)src;
        media_controller_ability_s *_dst = NULL;
 
@@ -266,7 +264,7 @@ int mc_playback_ability_clone(mc_playback_ability_h src, mc_playback_ability_h *
 
        *dst = (mc_playback_ability_h)_dst;
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_playback_ability_destroy(mc_playback_ability_h ability)
@@ -282,7 +280,6 @@ int mc_playback_ability_destroy(mc_playback_ability_h ability)
 
 int mc_playback_action_is_supported(mc_playback_ability_h ability, mc_playback_action_e action, mc_ability_support_e *supported)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_ability_s *mc_ability = (media_controller_ability_s *)ability;
 
        mc_retvm_if(mc_ability == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "ability is NULL");
@@ -301,7 +298,7 @@ int mc_playback_action_is_supported(mc_playback_ability_h ability, mc_playback_a
                *supported = MC_ABILITY_SUPPORTED_UNDECIDED;
        }
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 static void __destroy_search_list(gpointer data)
@@ -330,7 +327,6 @@ int mc_search_create(mc_search_h *search)
 
 int mc_search_set_condition(mc_search_h search, mc_content_type_e content_type, mc_search_category_e category, const char *search_keyword, bundle *data)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_search_s *mc_search = (media_controller_search_s *)search;
        mc_search_item_s *search_item = NULL;
 
@@ -351,12 +347,11 @@ int mc_search_set_condition(mc_search_h search, mc_content_type_e content_type,
 
        mc_search->search_list = g_list_append(mc_search->search_list, search_item);
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_search_destroy(mc_search_h search)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_search_s *mc_search = (media_controller_search_s *)search;
 
        mc_retvm_if(mc_search == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "search is NULL");
@@ -364,7 +359,7 @@ int mc_search_destroy(mc_search_h search)
        g_list_free_full(mc_search->search_list, __destroy_search_list);
        g_free(mc_search);
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_search_get_condition_count(mc_search_h search, int *condition_count)
@@ -433,7 +428,7 @@ int mc_search_clone(mc_search_h src, mc_search_h *dst)
 
        *dst = _dst;
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_metadata_encode_season(int season_num, const char *season_title, char **encoded_season)

diff --git a/src/media_controller_playlist.c b/src/media_controller_playlist.c
index 634bf3c9b25934fef84c95b56f17d56e957205a5..7e99ef1d820e9c37e4567ba8aa87084f8702cb84 100644 (file)
--- a/src/media_controller_playlist.c
+++ b/src/media_controller_playlist.c
@@ -205,8 +205,6 @@ int mc_playlist_update_item(mc_playlist_h playlist, const char *index, mc_meta_e
 
 int mc_playlist_get_name(mc_playlist_h playlist, char **playlist_name)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
-
        mc_playlist_s *_playlist = (mc_playlist_s*)playlist;
 
        mc_retvm_if(_playlist == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid playlist");
@@ -214,7 +212,7 @@ int mc_playlist_get_name(mc_playlist_h playlist, char **playlist_name)
 
        *playlist_name = g_strdup(_playlist->playlist_name);
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_playlist_get_playlist_count(const char *app_id, int *playlist_count)
@@ -327,7 +325,6 @@ int mc_playlist_get_playlist(const char *app_id, const char *playlist_name, mc_p
 
 int mc_playlist_clone(mc_playlist_h src, mc_playlist_h *dst)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        mc_playlist_s *_src = (mc_playlist_s*)src;
        mc_playlist_s *_dst = NULL;
 
@@ -341,12 +338,11 @@ int mc_playlist_clone(mc_playlist_h src, mc_playlist_h *dst)
 
        *dst = (mc_playlist_h)_dst;
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_playlist_destroy(mc_playlist_h playlist)
 {
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
        mc_playlist_s *_playlist = (mc_playlist_s*)playlist;
 
        mc_retvm_if(_playlist == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid playlist");
@@ -356,5 +352,5 @@ int mc_playlist_destroy(mc_playlist_h playlist)
        g_list_free_full(_playlist->item_list, __release_playlist_item);
        g_free(_playlist);
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }

diff --git a/src/media_controller_server.c b/src/media_controller_server.c
index 12871a627ac48d67788fd78e17c419f1f46ef65f..86ca0f28a3e9ec82a8a9c018e52706c02f1dff8a 100644 (file)
--- a/src/media_controller_server.c
+++ b/src/media_controller_server.c
@@ -628,10 +628,9 @@ static int __mc_server_send_event(mc_server_h server, const char *client_name, c
        interface_name = _mc_util_get_interface_name(MC_CLIENT, client_name);
 
        ret = _mc_ipc_send_message(mc_server->dconn, NULL, interface_name, signal_name, message, request_id);
-       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("Error _mc_ipc_send_message [%d]", ret);
+        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to _mc_ipc_send_message [%d]", ret);
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_server_set_playback_state(mc_server_h server, mc_playback_states_e state)
@@ -720,23 +719,19 @@ int mc_server_update_playback_info(mc_server_h server)
                mc_debug("playback info update: playlist_name[%s], index [%s]", mc_server->playback.playlist_name, mc_server->playback.index);
 
        ret = _mc_db_update_playback_info(mc_server->server_name, mc_server->playback);
-       if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
-               mc_error("fail _mc_db_update_playback_info [%d]", ret);
-               return ret;
-       }
+       mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to _mc_db_update_playback_info [%d]", ret);
 
        if (mc_server->playback.state == MC_PLAYBACK_STATE_PLAYING) {
                if(!_mc_db_is_latest_server(mc_server->db_handle, mc_server->server_name)) {
                        ret = _mc_db_update_latest_server_table(mc_server->server_name);
-                       mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail _mc_db_update_latest_server_table [%d]", ret);
+                       mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to _mc_db_update_latest_server_table [%d]", ret);
                }
        }
 
        ret = __mc_server_send_message(mc_server, MC_DBUS_SIGNAL_NAME_PLAY_BACK, 0, 0, NULL);
-       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("Error __mc_server_send_message [%d]", ret);
+       mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message [%d]", ret);
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_server_update_shuffle_mode(mc_server_h server, mc_shuffle_mode_e mode)
@@ -759,7 +754,7 @@ int mc_server_update_shuffle_mode(mc_server_h server, mc_shuffle_mode_e mode)
        ret = __mc_server_send_message(mc_server, MC_DBUS_SIGNAL_NAME_PLAYBACK_SHUFFLE, mode, 0, NULL);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message");
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_server_update_repeat_mode(mc_server_h server, mc_repeat_mode_e mode)
@@ -778,7 +773,7 @@ int mc_server_update_repeat_mode(mc_server_h server, mc_repeat_mode_e mode)
        ret = __mc_server_send_message(mc_server, MC_DBUS_SIGNAL_NAME_PLAYBACK_REPEAT, mode, 0, NULL);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message");
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_server_update_subtitles_enabled(mc_server_h server, bool enabled)
@@ -796,7 +791,7 @@ int mc_server_update_subtitles_enabled(mc_server_h server, bool enabled)
        ret = __mc_server_send_message(mc_server, MC_DBUS_SIGNAL_NAME_SUBTITLES, enabled, 0, NULL);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message");
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_server_update_display_mode(mc_server_h server, mc_display_mode_e mode)
@@ -815,7 +810,7 @@ int mc_server_update_display_mode(mc_server_h server, mc_display_mode_e mode)
        ret = __mc_server_send_message(mc_server, MC_DBUS_SIGNAL_NAME_DISPLAY_MODE, mode, 0, NULL);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message");
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_server_update_display_rotation(mc_server_h server, mc_display_rotation_e rotation)
@@ -833,7 +828,7 @@ int mc_server_update_display_rotation(mc_server_h server, mc_display_rotation_e
        ret = __mc_server_send_message(mc_server, MC_DBUS_SIGNAL_NAME_DISPLAY_ROTATION, rotation, 0, NULL);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message");
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_server_update_360_mode_enabled(mc_server_h server, bool enabled)
@@ -851,7 +846,7 @@ int mc_server_update_360_mode_enabled(mc_server_h server, bool enabled)
        ret = __mc_server_send_message(mc_server, MC_DBUS_SIGNAL_NAME_360, enabled, 0, NULL);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message");
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_server_set_metadata(mc_server_h server, mc_meta_e attribute, const char *value)
@@ -880,7 +875,7 @@ int mc_server_update_metadata(mc_server_h server)
        ret = __mc_server_send_message(mc_server, MC_DBUS_SIGNAL_NAME_METADATA, 0, 0, NULL);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message");
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_server_create_playlist(mc_server_h server, const char *playlist_name, mc_playlist_h *playlist)
@@ -916,7 +911,7 @@ int mc_server_update_playlist_done(mc_server_h server, mc_playlist_h playlist)
        ret = __mc_server_send_message(mc_server, MC_DBUS_SIGNAL_NAME_PLAYLIST, MC_PLAYLIST_UPDATED, 0, _playlist->playlist_name);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message");
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_server_delete_playlist(mc_server_h server, mc_playlist_h playlist)
@@ -935,7 +930,7 @@ int mc_server_delete_playlist(mc_server_h server, mc_playlist_h playlist)
        ret = __mc_server_send_message(mc_server, MC_DBUS_SIGNAL_NAME_PLAYLIST, MC_PLAYLIST_REMOVED, 0, _playlist->playlist_name);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message");
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 static int __mc_server_set_ability(mc_server_h server, mc_ability_e ability, mc_ability_support_e support)
@@ -951,7 +946,7 @@ static int __mc_server_set_ability(mc_server_h server, mc_ability_e ability, mc_
        ret = __mc_server_send_message(mc_server, MC_DBUS_SIGNAL_NAME_ABILITY_SUPPORT, ability, support, NULL);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message");
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 static int __mc_server_set_updated_cb(mc_server_h server, mc_server_receive_event_e event, void *callback, void *user_data)
@@ -1130,10 +1125,9 @@ int mc_server_send_cmd_reply(mc_server_h server, const char *client_name, const
 
        interface_name = _mc_util_get_interface_name(MC_CLIENT, client_name);
        ret = _mc_ipc_send_reply(mc_server->dconn, NULL, interface_name, MC_DBUS_SIGNAL_NAME_CMD_REPLY, message, request_id);
-       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("Error _mc_ipc_send_message [%d]", ret);
+       mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to _mc_ipc_send_reply [%d]", ret);
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_server_foreach_client(mc_server_h server, mc_activated_client_cb callback, void *user_data)
@@ -1223,7 +1217,7 @@ int mc_server_update_playback_ability(mc_server_h server)
        ret = __mc_server_send_message(mc_server, MC_DBUS_SIGNAL_NAME_PLAYBACK_ABILITY, 0, 0, NULL);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message");
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 int mc_server_set_ability_support(mc_server_h server, mc_ability_e ability, mc_ability_support_e support)
@@ -1326,7 +1320,7 @@ int mc_server_create(mc_server_h *server)
 
        ret = __mc_server_create(&mc_server);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
-               mc_error("fail __mc_server_create [%d]", ret);
+               mc_error("fail to __mc_server_create [%d]", ret);
                __mc_server_destoy(mc_server);
                return ret;
        }
@@ -1338,7 +1332,7 @@ int mc_server_create(mc_server_h *server)
 
        ret = __mc_server_send_message(mc_server, MC_DBUS_SIGNAL_NAME_SERVER_STATE, MC_SERVER_STATE_ACTIVATE, 0, NULL);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("Error __mc_server_send_message [%d]", ret);
+               mc_error("fail to __mc_server_send_message [%d]", ret);
 
        *server = (mc_server_h)mc_server;
 
@@ -1358,15 +1352,15 @@ int mc_server_destroy(mc_server_h server)
 
        ret = _mc_ipc_unregister_all_listener(&mc_server->listeners);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("fail _mc_ipc_unregister_all_listener [%d]", ret);
+               mc_error("fail to _mc_ipc_unregister_all_listener [%d]", ret);
 
        ret = __mc_server_send_message(mc_server, MC_DBUS_SIGNAL_NAME_SERVER_STATE, MC_SERVER_STATE_DEACTIVATE, 0, NULL);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("Error __mc_server_send_message [%d]", ret);
+               mc_error("fail to __mc_server_send_message [%d]", ret);
 
        ret = __mc_server_destoy(mc_server);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("fail __mc_server_destoy [%d]", ret);
+               mc_error("fail to __mc_server_destoy [%d]", ret);
 
        mc_info_fleave();
 

diff --git a/src/media_controller_util.c b/src/media_controller_util.c
index c441c1d77e310b67fea274099d306f1bf72dab7b..18fee04faa202bacfee2cf528ae0f5e69f16d02e 100644 (file)
--- a/src/media_controller_util.c
+++ b/src/media_controller_util.c
@@ -139,7 +139,7 @@ int _mc_util_bundle_to_string(bundle *bundle_data, char **str_data)
 
        if (bundle_data) {
                ret = bundle_encode(bundle_data, &raw_data, &size_r);
-               mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "Error when encode bundle [%d]", ret);
+               mc_retvm_if(ret != BUNDLE_ERROR_NONE, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "Error when encode bundle [%d]", ret);
        }
 
        if ((size_r == 0) || (raw_data == NULL))
@@ -149,7 +149,7 @@ int _mc_util_bundle_to_string(bundle *bundle_data, char **str_data)
 
        MC_SAFE_FREE(raw_data);
 
-       return ret;
+       return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
 gboolean _mc_util_is_valid_playback_action(mc_playback_action_e action)