From bc4aff45d9a66a51394431ad14d8ad61a268de53 Mon Sep 17 00:00:00 2001 From: "jiyong.min" Date: Thu, 4 Jun 2020 13:45:13 +0900 Subject: [PATCH] Code cleanup for function to check parameter validity Change-Id: Ib6e5a83009c6763ec44abc048031cbd9144e51a1 --- include/media_controller_private.h | 7 +++ src/media_controller_client.c | 105 +++++++++++++++---------------------- src/media_controller_ipc.c | 4 +- src/media_controller_playlist.c | 2 +- src/media_controller_server.c | 86 +++++++++++------------------- src/media_controller_util.c | 8 +-- svc/media_controller_db_util.c | 8 +-- svc/media_controller_svc.c | 21 ++++---- 8 files changed, 101 insertions(+), 140 deletions(-) diff --git a/include/media_controller_private.h b/include/media_controller_private.h index e7d0d46..340d899 100644 --- a/include/media_controller_private.h +++ b/include/media_controller_private.h @@ -85,6 +85,13 @@ extern "C" { LOGD(FONT_COLOR_YELLOW""FONT_COLOR_RESET); \ } while (0) +#define mc_retm_if_failed(expr) do { \ + if (!(expr)) { \ + mc_error("invalid %s", #expr); \ + return; \ + } \ + } while (0) + #define mc_retm_if(expr, fmt, arg...) do { \ if (expr) { \ LOGE(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg); \ diff --git a/src/media_controller_client.c b/src/media_controller_client.c index f631efa..62183fe 100644 --- a/src/media_controller_client.c +++ b/src/media_controller_client.c @@ -73,16 +73,14 @@ static void __client_server_cb(const char *interface_name, const char *signal_na { gchar **params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "receiver is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_server_state_updated_cb callback = (mc_server_state_updated_cb)receiver->callback; - mc_retm_if(callback == NULL, "server_state_cb is NULL"); - mc_retm_if(message == NULL, "message is NULL"); mc_secure_debug("__client_server_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 server data"); + mc_retm_if_failed(params); callback(params[0], (mc_server_state_e)atoi(params[1]), receiver->user_data); @@ -95,11 +93,11 @@ static void __client_playback_cb(const char *interface_name, const char *signal_ mc_playback_h playback = NULL; media_controller_client_s *mc_client = (media_controller_client_s *)user_data; - mc_retm_if(mc_client == NULL, "mc_client is NULL"); + mc_retm_if_failed(mc_client); mc_playback_updated_cb callback = (mc_playback_updated_cb)mc_client->updated_cb[MC_CLIENT_EVENT_PLAYBACK_INFO].callback; - mc_retm_if(callback == NULL, "playback_cb is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(callback); + mc_retm_if_failed(message); mc_secure_debug("__client_playback_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data); @@ -118,11 +116,11 @@ static void __client_metadata_cb(const char *interface_name, const char *signal_ mc_metadata_h metadata = NULL; media_controller_client_s *mc_client = (media_controller_client_s *)user_data; - mc_retm_if(mc_client == NULL, "mc_client is NULL"); + mc_retm_if_failed(mc_client); mc_metadata_updated_cb callback = (mc_metadata_updated_cb)mc_client->updated_cb[MC_CLIENT_EVENT_METADATA].callback; - mc_retm_if(callback == NULL, "metadata_cb is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(callback); + mc_retm_if_failed(message); mc_secure_debug("__client_metadata_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data); @@ -139,16 +137,15 @@ static void __client_shuffle_cb(const char *interface_name, const char *signal_n { gchar **params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "receiver is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_shuffle_mode_updated_cb callback = (mc_shuffle_mode_updated_cb)receiver->callback; - mc_retm_if(callback == NULL, "shuffle_cb is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(message); mc_secure_debug("__client_shuffle_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 shuffle mode data"); + mc_retm_if_failed(params); callback(params[0], (mc_shuffle_mode_e)atoi(params[1]), receiver->user_data); @@ -159,16 +156,15 @@ static void __client_repeat_cb(const char *interface_name, const char *signal_na { gchar **params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "receiver is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_repeat_mode_updated_cb callback = (mc_repeat_mode_updated_cb)receiver->callback; - mc_retm_if(callback == NULL, "repeat_cb is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(message); mc_secure_debug("__client_repeat_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 repeat mode data"); + mc_retm_if_failed(params); callback(params[0], (mc_repeat_mode_e)atoi(params[1]), receiver->user_data); @@ -182,16 +178,15 @@ static void __client_playlist_cb(const char *interface_name, const char *signal_ mc_playlist_s *_playlist = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "receiver is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_playlist_updated_cb callback = (mc_playlist_updated_cb)receiver->callback; - mc_retm_if(callback == NULL, "playlist_cb is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(message); mc_secure_debug("__client_playlist_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 custom data"); + mc_retm_if_failed(params); mode = atoi(params[1]); @@ -216,16 +211,15 @@ static void __client_cmd_reply_received_cb(const char *interface_name, const cha bundle *bundle_data = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "receiver is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_cmd_reply_received_cb callback = (mc_cmd_reply_received_cb)receiver->callback; - mc_retm_if(callback == NULL, "reply_cb is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(message); mc_secure_debug("__client_cmd_reply_received_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 custom data"); + mc_retm_if_failed(params); if (params[1] != NULL) mc_retm_if(MEDIA_CONTROLLER_ERROR_NONE != mc_safe_strtoi(params[1], &result_code), "getting result_code is failed"); @@ -250,15 +244,14 @@ static void __client_custom_event_received_cb(const char *interface_name, const bundle *bundle_data = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "receiver is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_client_custom_event_received_cb callback = receiver->callback; - mc_retm_if(receiver->callback == NULL, "custom_event_received_cb is NULL"); mc_secure_debug("__client_custom_event_received_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 custom data"); + mc_retm_if_failed(params); if (params[0]) sender = g_strdup(params[0]); @@ -289,11 +282,11 @@ static void __client_playback_ability_cb(const char *interface_name, const char mc_playback_ability_h ability = NULL; media_controller_client_s *mc_client = (media_controller_client_s *)user_data; - mc_retm_if(mc_client == NULL, "mc_client is NULL"); + mc_retm_if_failed(mc_client); mc_playback_ability_updated_cb callback = (mc_playback_ability_updated_cb)mc_client->updated_cb[MC_CLIENT_EVENT_PLAYBACK_ABILITY].callback; - mc_retm_if(callback == NULL, "playback_ability_cb is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(callback); + mc_retm_if_failed(message); mc_secure_debug("__client_playback_ability_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data); @@ -310,16 +303,14 @@ static void __client_ability_cb(const char *interface_name, const char *signal_n { gchar **params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "receiver is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_shuffle_ability_updated_cb callback = (mc_shuffle_ability_updated_cb)receiver->callback; - 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); params = g_strsplit(message, MC_STRING_DELIMITER, 0); - mc_retm_if(params == NULL, "invalid ability data"); + mc_retm_if_failed(params); callback(params[0], (mc_ability_support_e)atoi(params[1]), receiver->user_data); @@ -330,16 +321,14 @@ static void __client_ability_support_cb(const char *interface_name, const char * { gchar **params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "receiver is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_ability_support_updated_cb callback = (mc_ability_support_updated_cb)receiver->callback; - mc_retm_if(callback == NULL, "callback is NULL"); - mc_retm_if(message == NULL, "message is NULL"); 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"); + mc_retm_if_failed(params); callback(params[0], (mc_ability_e)atoi(params[1]), (mc_ability_support_e)atoi(params[2]), receiver->user_data); @@ -352,11 +341,11 @@ static void __client_display_mode_ability_cb(const char *interface_name, const c unsigned int ability = 0; media_controller_client_s *mc_client = (media_controller_client_s *)user_data; - mc_retm_if(!mc_client, "mc_client is NULL"); + mc_retm_if_failed(mc_client); mc_ability_supported_items_updated_cb callback = (mc_ability_supported_items_updated_cb)mc_client->updated_cb[MC_CLIENT_EVENT_DISPLAY_MODE_ABILITY].callback; - mc_retm_if(!callback , "display_mode_ability_cb is NULL"); - mc_retm_if(!message, "message is NULL"); + mc_retm_if_failed(callback); + mc_retm_if_failed(message); mc_secure_debug("__client_display_mode_ability_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data); @@ -374,11 +363,11 @@ static void __client_display_rotation_ability_cb(const char *interface_name, con unsigned int ability = 0; media_controller_client_s *mc_client = (media_controller_client_s *)user_data; - mc_retm_if(!mc_client, "mc_client is NULL"); + mc_retm_if_failed(mc_client); mc_ability_supported_items_updated_cb callback = (mc_ability_supported_items_updated_cb)mc_client->updated_cb[MC_CLIENT_EVENT_DISPLAY_ROTATION_ABILITY].callback; - mc_retm_if(!callback , "display_rotation_ability_cb is NULL"); - mc_retm_if(!message, "message is NULL"); + mc_retm_if_failed(callback); + mc_retm_if_failed(message); mc_secure_debug("__client_display_rotation_ability_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data); @@ -394,16 +383,14 @@ static void __client_attribute_cb(const char *interface_name, const char *signal { gchar **params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(!receiver, "Invalid receiver"); + mc_retm_if_failed(receiver && receiver->callback); mc_bool_attribute_updated_cb callback = (mc_bool_attribute_updated_cb)receiver->callback; - mc_retm_if(!callback, "Invalid callback"); - mc_retm_if(!message, "Invalid message"); mc_secure_debug("__client_attribute_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 data"); + mc_retm_if_failed(params); callback(params[0], atoi(params[1]), receiver->user_data); @@ -414,16 +401,14 @@ static void __client_display_mode_cb(const char *interface_name, const char *sig { gchar **params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(!receiver, "Invalid receiver"); + mc_retm_if_failed(receiver && receiver->callback); mc_display_mode_updated_cb callback = (mc_display_mode_updated_cb)receiver->callback; - mc_retm_if(!callback, "Invalid callback"); - mc_retm_if(!message, "Invalid message"); mc_secure_debug("__client_display_mode_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 data"); + mc_retm_if_failed(params); callback(params[0], (mc_display_mode_e)atoi(params[1]), receiver->user_data); @@ -434,16 +419,14 @@ static void __client_display_rotation_cb(const char *interface_name, const char { gchar **params = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(!receiver, "Invalid receiver"); + mc_retm_if_failed(receiver && receiver->callback); mc_display_rotation_updated_cb callback = (mc_display_rotation_updated_cb)receiver->callback; - mc_retm_if(!callback, "Invalid callback"); - mc_retm_if(!message, "Invalid message"); mc_secure_debug("__client_display_rotation_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 data"); + mc_retm_if_failed(params); callback(params[0], (mc_display_rotation_e)atoi(params[1]), receiver->user_data); @@ -1671,16 +1654,14 @@ static void __client_reply_cb(const char *interface_name, const char *signal_nam bundle *bundle_data = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "receiver is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_command_reply_received_cb callback = (mc_command_reply_received_cb)receiver->callback; - mc_retm_if(callback == NULL, "reply_cb is NULL"); - mc_retm_if(message == NULL, "message is NULL"); mc_debug("__client_reply_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 custom data"); + mc_retm_if_failed(params); enc_size = atoi(params[2]); if (enc_size > 0) diff --git a/src/media_controller_ipc.c b/src/media_controller_ipc.c index 733e552..f5df970 100644 --- a/src/media_controller_ipc.c +++ b/src/media_controller_ipc.c @@ -67,8 +67,8 @@ static void __dbus_signal_cb(GDBusConnection *connection, gchar *request_id = NULL; g_variant_get(parameters, "(&s&s)", &request_id, &message); - mc_retm_if(!message, "message is NULL"); - mc_retm_if(!user_data, "user_data is NULL"); + mc_retm_if_failed(message); + mc_retm_if_failed(user_data); if ((request_id != NULL) && (!g_strcmp0(request_id, DEFAULT_REQ_ID))) request_id = NULL; diff --git a/src/media_controller_playlist.c b/src/media_controller_playlist.c index 8826894..baefe55 100644 --- a/src/media_controller_playlist.c +++ b/src/media_controller_playlist.c @@ -28,7 +28,7 @@ typedef struct { static void __release_playlist_item(gpointer data) { mc_playlist_item_s *playlist_item = (mc_playlist_item_s *)data; - mc_retm_if(!playlist_item, "invalid playlist_item"); + mc_retm_if_failed(playlist_item); g_free(playlist_item->index); mc_metadata_destroy((mc_metadata_h)playlist_item->metadata); diff --git a/src/media_controller_server.c b/src/media_controller_server.c index 5460b3b..c44a265 100644 --- a/src/media_controller_server.c +++ b/src/media_controller_server.c @@ -158,16 +158,14 @@ static void __server_playback_action_cb(const char *interface_name, const char * media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; - mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_server_playback_action_cmd_received_cb callback = receiver->callback; - mc_retm_if(receiver->callback == NULL, "playback_action_command_received_cb is NULL"); mc_secure_debug("__server_playback_action_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 playback_action command"); + mc_retm_if_failed(params); 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"); @@ -192,16 +190,14 @@ static void __server_playback_position_cmd_cb(const char *interface_name, const media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; unsigned long long value = 0; - mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_server_playback_position_cmd_received_cb callback = receiver->callback; - mc_retm_if(receiver->callback == NULL, "playback_position_cmd_received_cb is NULL"); mc_secure_debug("__server_playback_position_cmd_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 playback_position command"); + mc_retm_if_failed(params); 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"); @@ -226,16 +222,14 @@ static void __server_shuffle_mode_cmd_cb(const char *interface_name, const char media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; - mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_server_shuffle_mode_cmd_received_cb callback = receiver->callback; - mc_retm_if(receiver->callback == NULL, "shuffle_mode_cmd_received_cb is NULL"); mc_secure_debug("__server_shuffle_mode_cmd_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 shuffle_mode command"); + mc_retm_if_failed(params); 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"); @@ -260,16 +254,14 @@ static void __server_repeat_mode_cmd_cb(const char *interface_name, const char * media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; - mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_server_repeat_mode_cmd_received_cb callback = receiver->callback; - mc_retm_if(receiver->callback == NULL, "repeat_mode_cmd_received_cb is NULL"); mc_secure_debug("__server_repeat_mode_cmd_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 repeat_mode command"); + mc_retm_if_failed(params); 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"); @@ -295,16 +287,14 @@ static void __server_play_playlist_cmd_cb(const char *interface_name, const char int action = 0; unsigned long long position = 0; - mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_server_playlist_cmd_received_cb callback = receiver->callback; - mc_retm_if(receiver->callback == NULL, "mc_server_playlist_cmd_received_cb is NULL"); mc_secure_debug("__server_play_playlist_cmd_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 play_playlist command"); + mc_retm_if_failed(params); 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"); @@ -338,16 +328,14 @@ static void __server_custom_cmd_cb(const char *interface_name, const char *signa bundle *bundle_data = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_server_custom_cmd_received_cb callback = receiver->callback; - mc_retm_if(receiver->callback == NULL, "custom_command_received_cb is NULL"); mc_secure_debug("__server_custom_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 custom data"); + mc_retm_if_failed(params); if (params[0]) sender = g_strdup(params[0]); @@ -380,16 +368,14 @@ static void __server_event_reply_received_cb(const char *interface_name, const c bundle *bundle_data = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_cmd_reply_received_cb callback = (mc_cmd_reply_received_cb)receiver->callback; - mc_retm_if(receiver->callback == NULL, "reply_cb is NULL"); mc_secure_debug("__server_event_reply_received_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 custom data"); + mc_retm_if_failed(params); if (params[1] != NULL) mc_retm_if(MEDIA_CONTROLLER_ERROR_NONE != mc_safe_strtoi(params[1], &result_code), "getting result_code is failed"); @@ -423,7 +409,7 @@ static void __search_cb(const char *key, const int type, const bundle_keyval_t mc_secure_debug("key [%s], type [%d], basic_val [%s]", key, type, (char *)basic_val); params = g_strsplit(basic_val, MC_STRING_DELIMITER, 0); - mc_retm_if(params == NULL, "invalid search data"); + mc_retm_if_failed(params); if (mc_safe_strtoi(params[0], &content_type) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error get content_type"); @@ -470,16 +456,14 @@ static void __server_search_cmd_cb(const char *interface_name, const char *signa media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; media_controller_search_s *mc_search = NULL; - mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_server_search_cmd_received_cb callback = receiver->callback; - mc_retm_if(receiver->callback == NULL, "search_command_received_cb is NULL"); mc_secure_debug("__server_search_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 search data"); + mc_retm_if_failed(params); 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"); @@ -526,17 +510,15 @@ static void __server_enable_cmd_cb(const char *interface_name, const char *signa media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; - mc_retm_if(!receiver, "Invalid receiver"); - mc_retm_if(!signal_name, "Invalid signal_name"); - mc_retm_if(!message, "Invalid message"); + mc_retm_if_failed(receiver && receiver->callback); + mc_retm_if_failed(signal_name); mc_server_enable_cmd_received_cb callback = receiver->callback; - mc_retm_if(!receiver->callback, "mc_server_enable_cmd_received_cb is NULL"); mc_secure_debug("__server_enable_cmd_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 command"); + mc_retm_if_failed(params); 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) { @@ -573,17 +555,15 @@ static void __server_display_mode_cb(const char *interface_name, const char *sig media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; - mc_retm_if(!receiver, "Invalid receiver"); - mc_retm_if(!signal_name, "Invalid signal_name"); - mc_retm_if(!message, "Invalid message"); + mc_retm_if_failed(receiver && receiver->callback); + mc_retm_if_failed(signal_name); mc_server_display_mode_cmd_received_cb callback = receiver->callback; - mc_retm_if(!receiver->callback, "mc_server_display_mode_cmd_received_cb is NULL"); mc_secure_debug("__server_display_mode_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 display mode command"); + mc_retm_if_failed(params); 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"); @@ -608,17 +588,15 @@ static void __server_display_rotation_cb(const char *interface_name, const char media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; - mc_retm_if(!receiver, "Invalid receiver"); - mc_retm_if(!signal_name, "Invalid signal_name"); - mc_retm_if(!message, "Invalid message"); + mc_retm_if_failed(receiver && receiver->callback); + mc_retm_if_failed(signal_name); mc_server_display_rotation_cmd_received_cb callback = receiver->callback; - mc_retm_if(!receiver->callback, "mc_server_display_rotation_cmd_received_cb is NULL"); mc_secure_debug("__server_display_rotation_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 display rotation command"); + mc_retm_if_failed(params); 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"); @@ -1536,16 +1514,14 @@ static void __server_playback_state_command_cb(const char *interface_name, const media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; - mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_server_playback_state_command_received_cb callback = receiver->callback; - mc_retm_if(receiver->callback == NULL, "playback_state_command_received_cb is NULL"); mc_debug("__server_playback_state_command_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 playback state command"); + mc_retm_if_failed(params); if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_PLAYBACKSTATE, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); @@ -1573,16 +1549,14 @@ static void __server_custom_command_cb(const char *interface_name, const char *s bundle *bundle_data = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_retm_if(message == NULL, "message is NULL"); + mc_retm_if_failed(receiver && receiver->callback); mc_server_custom_command_received_cb callback = receiver->callback; - mc_retm_if(receiver->callback == NULL, "custom_command_received_cb is NULL"); mc_debug("__server_custom_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 custom data"); + mc_retm_if_failed(params); if (params[0]) sender = g_strdup(params[0]); diff --git a/src/media_controller_util.c b/src/media_controller_util.c index 3a997a0..17cbbd7 100644 --- a/src/media_controller_util.c +++ b/src/media_controller_util.c @@ -30,7 +30,7 @@ static void __mc_util_check_valid_name(const char *name, char **valid_name) char new_word[MAX_NAME_LENGTH] = {0, }; unsigned int i = 0, j = 0; - mc_retm_if(name == NULL, "Invalid parameter."); + mc_retm_if_failed(name); memset(old_word, 0, MAX_NAME_LENGTH); memset(new_word, 0, MAX_NAME_LENGTH); @@ -64,7 +64,7 @@ static void __mc_util_check_valid_name(const char *name, char **valid_name) *valid_name = g_strdup(new_word); - mc_retm_if((*valid_name) == NULL, "Error allocation memory."); + mc_retm_if_failed((*valid_name)); } int _mc_util_get_own_name(char **name) @@ -236,8 +236,8 @@ void _mc_util_set_bit(int bit_num, gboolean set, unsigned long long *value) int i = 0; unsigned long long lshift = MC_BIT64_SET; - mc_retm_if(!value, "Invalid value"); - mc_retm_if((bit_num < 0 || bit_num >= 64), "Invalid bit [%d]", bit_num); + mc_retm_if_failed(value); + mc_retm_if_failed((bit_num >= 0 && bit_num < 64)); if (MC_SHIFT_IS_OK(bit_num)) { lshift = (lshift << bit_num); diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c index ccebb91..c1ec24b 100644 --- a/svc/media_controller_db_util.c +++ b/svc/media_controller_db_util.c @@ -591,16 +591,16 @@ static void __make_playlist_query_cb(const char *key, const int type, const bun playlist_query_s *query = (playlist_query_s *)user_data; char *sql_str = NULL; - mc_retm_if(!key, "invalid key"); - mc_retm_if(!kv, "invalid kv"); - mc_retm_if(!query, "invalid query"); + mc_retm_if_failed(key); + mc_retm_if_failed(kv); + mc_retm_if_failed(query); bundle_keyval_get_basic_val((bundle_keyval_t *)kv, &basic_val, &basic_size); //mc_secure_debug("Key [%s], Type [%d], basic_val [%s]", key, type, (char *)basic_val); params = g_strsplit(basic_val, MC_STRING_DELIMITER, 0); - mc_retm_if(params == NULL, "invalid playlist data"); + mc_retm_if_failed(params); sql_str = sqlite3_mprintf("INSERT INTO %q(server_name, playlist_name, item_index, %s) VALUES (%Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q);", MC_DB_TABLE_PLAYLIST, META_LIST, query->server_name, query->playlist_name, key, diff --git a/svc/media_controller_svc.c b/svc/media_controller_svc.c index 437b630..6251b79 100644 --- a/svc/media_controller_svc.c +++ b/svc/media_controller_svc.c @@ -77,7 +77,7 @@ static int __mc_sys_get_uid(uid_t *uid) static void __mc_destroy_queue(gpointer data) { mc_service_request *req = (mc_service_request *)data; - mc_retm_if(!req, "invalid request"); + mc_retm_if_failed(req); if (req->req_msg) g_free(req->req_msg->msg); @@ -88,7 +88,7 @@ static void __mc_destroy_queue(gpointer data) static void __mc_destroy_connected_apps(gpointer data) { mc_app_data_set_t *_app_data = (mc_app_data_set_t *)data; - mc_retm_if(!_app_data, "invalid _app_data"); + mc_retm_if_failed(_app_data); if (_app_data->cmds_to_send != NULL) { g_list_free_full(_app_data->cmds_to_send, g_free); @@ -100,7 +100,7 @@ static void __mc_destroy_connected_apps(gpointer data) static void __mc_destroy_request_queue(mc_manage_queue_t *data) { - mc_retm_if(!data, "invalid data"); + mc_retm_if_failed(data); g_queue_free_full(data->queue, __mc_destroy_queue); data->queue = NULL; @@ -116,8 +116,8 @@ static void __mc_add_cmd_to_send(gpointer data, gpointer user_data) mc_app_data_set_t *_app_data = (mc_app_data_set_t *)data; mc_comm_msg_s *_user_data = (mc_comm_msg_s *)user_data; - mc_retm_if(!_app_data, "Invalid data"); - mc_retm_if(!_user_data, "Invalid user_data"); + mc_retm_if_failed(_app_data); + mc_retm_if_failed(_user_data); if (_app_data->pid == _user_data->pid) _app_data->cmds_to_send = g_list_append(_app_data->cmds_to_send, g_strdup(_user_data->msg)); @@ -129,12 +129,11 @@ static void __mc_remove_cmd_to_send(gpointer data, gpointer user_data) mc_list_user_data *_user_data = (mc_list_user_data *)user_data; GList *iter = NULL; - mc_retm_if(!_app_data, "Invalid data"); - mc_retm_if(!_user_data, "Invalid user_data"); - mc_retm_if(!_user_data->message, "Invalid message"); - mc_retm_if(!_user_data->message->msg_size, "Invalid msg_size"); - mc_retm_if(!MC_STRING_VALID(_user_data->message->msg), "Invalid msg"); - mc_retm_if(!_app_data->cmds_to_send, "Nothing to remove"); + mc_retm_if_failed(_app_data); + mc_retm_if_failed(_user_data); + mc_retm_if_failed(_user_data->message); + mc_retm_if_failed(_user_data->message->msg_size); + mc_retm_if_failed(MC_STRING_VALID(_user_data->message->msg)); for (iter = _app_data->cmds_to_send; iter; iter = g_list_next(iter)) { if (!iter->data) -- 2.7.4