From: hj kim Date: Mon, 13 Jan 2020 23:54:13 +0000 (+0900) Subject: Remove duplicated codes X-Git-Tag: submit/tizen/20200115.071738~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb489db347ca55ecf765593ddfe388f3134bb962;p=platform%2Fcore%2Fapi%2Fmedia-controller.git Remove duplicated codes Change-Id: I1b1feb67b594544f09a725f4d3248d2c651b4b8b --- diff --git a/src/media_controller_db.c b/src/media_controller_db.c index ea54cf5..7bef16e 100644 --- a/src/media_controller_db.c +++ b/src/media_controller_db.c @@ -32,9 +32,9 @@ static int __mc_db_get_record(sqlite3 *handle, char *sql_str, sqlite3_stmt **stm int ret = SQLITE_OK; sqlite3_stmt *statement = NULL; - mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid handle"); - mc_retvm_if(stmt == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "sqlite3_stmt is null"); - mc_retvm_if(!MC_STRING_VALID(sql_str), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL string is null"); + mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle"); + mc_retvm_if(!stmt, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid stmt"); + mc_retvm_if(!MC_STRING_VALID(sql_str), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "SQL string is null"); ret = sqlite3_prepare_v2(handle, sql_str, strlen(sql_str), &statement, NULL); SQLITE3_SAFE_FREE(sql_str); @@ -165,8 +165,6 @@ int _mc_db_get_latest_server_info(sqlite3 *handle, char **latest_server_name, mc char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); - *latest_server_name = NULL; sql_str = sqlite3_mprintf("SELECT name, server_state FROM %q WHERE name IN (SELECT name FROM %q)", MC_DB_TABLE_SERVER_INFO, MC_DB_TABLE_LATEST_SERVER); @@ -193,9 +191,8 @@ int _mc_db_get_playback_info(sqlite3 *handle, const char *server_name, mc_playba char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); - mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL"); - mc_retvm_if(playback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "playback is NULL"); + mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); + mc_retvm_if(!playback, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid playback"); sql_str = sqlite3_mprintf("SELECT playback_state, playback_position, playlist_name, playlist_index, playback_content_type, age_rating FROM %q WHERE name=%Q", MC_DB_TABLE_SERVER_INFO, server_name); @@ -229,10 +226,10 @@ static int __mc_db_get_metadata(sqlite3_stmt *stmt, int col, mc_metadata_h *meta { media_controller_metadata_s *_metadata = NULL; - mc_retvm_if(metadata == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "metadata is NULL"); + mc_retvm_if(!metadata, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid metadata"); _metadata = (media_controller_metadata_s *)calloc(1, sizeof(media_controller_metadata_s)); - mc_retvm_if(_metadata == NULL, MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); + mc_retvm_if(!_metadata, MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); if (stmt != NULL) { _metadata->title = g_strdup((const char *)sqlite3_column_text(stmt, col++)); @@ -262,9 +259,8 @@ int _mc_db_get_metadata_info(sqlite3 *handle, const char *server_name, mc_metada char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); - mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL"); - mc_retvm_if(metadata == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "metadata is NULL"); + mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); + mc_retvm_if(!metadata, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid metadata"); sql_str = sqlite3_mprintf("SELECT %s FROM %q WHERE name=%Q", META_LIST, MC_DB_TABLE_LATEST_META, server_name); @@ -283,9 +279,8 @@ int _mc_db_get_shuffle_mode(sqlite3 *handle, const char *server_name, mc_shuffle char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); - mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL"); - mc_retvm_if(mode == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "mode is NULL"); + mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); + mc_retvm_if(!mode, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid mode"); sql_str = sqlite3_mprintf("SELECT shuffle_mode FROM %q WHERE name=%Q", MC_DB_TABLE_SERVER_INFO, server_name); @@ -304,9 +299,8 @@ int _mc_db_get_repeat_mode(sqlite3 *handle, const char *server_name, mc_repeat_m char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); - mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL"); - mc_retvm_if(mode == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "mode is NULL"); + mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); + mc_retvm_if(!mode, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid mode"); sql_str = sqlite3_mprintf("SELECT repeat_mode FROM %q WHERE name=%Q", MC_DB_TABLE_SERVER_INFO, server_name); @@ -325,9 +319,8 @@ int _mc_db_get_icon_uri(sqlite3 *handle, const char *server_name, char **uri) char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); - mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL"); - mc_retvm_if(uri == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "uri is NULL"); + mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); + mc_retvm_if(!uri, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid uri"); sql_str = sqlite3_mprintf("SELECT icon_uri FROM %q WHERE name=%Q", MC_DB_TABLE_SERVER_INFO, server_name); @@ -346,10 +339,9 @@ static int __mc_db_get_ability(sqlite3 *handle, const char *server_name, unsigne char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid handle"); - mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid server_name"); - mc_retvm_if(!decided, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid decided"); - mc_retvm_if(!supported, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid supported"); + mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); + mc_retvm_if(!decided, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid decided"); + mc_retvm_if(!supported, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid supported"); sql_str = sqlite3_mprintf("SELECT ability_decided, ability_supported FROM %q WHERE name=%Q", MC_DB_TABLE_SERVER_INFO, server_name); @@ -480,8 +472,7 @@ int _mc_db_get_playlist_count(sqlite3 *handle, const char *server_name) int count = 0; sqlite3_stmt *stmt = NULL; - mc_retvm_if(handle == NULL, 0, "invalid handle"); - mc_retvm_if(server_name == NULL, 0, "invalid server_name"); + mc_retvm_if(!server_name, 0, "Invalid server_name"); sql_str = sqlite3_mprintf("SELECT COUNT(DISTINCT playlist_name) FROM %q WHERE server_name = %Q", MC_DB_TABLE_PLAYLIST, server_name); @@ -500,9 +491,9 @@ int _mc_db_get_foreach_playlist(sqlite3 *handle, const char *server_name, mc_pla char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid handle"); - mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid server_name"); - mc_retvm_if(callback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid callback"); + mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle"); + mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); + mc_retvm_if(!callback, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid callback"); sql_str = sqlite3_mprintf("SELECT playlist_name FROM %q WHERE server_name=%Q GROUP BY playlist_name", MC_DB_TABLE_PLAYLIST, server_name); mc_retvm_if(!MC_STRING_VALID(sql_str), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL string is null"); @@ -561,10 +552,9 @@ int _mc_db_get_playlist_by_name(sqlite3 *handle, mc_priv_type_e type, const char int ret = MEDIA_CONTROLLER_ERROR_NONE; gboolean is_exist = FALSE; - mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); - mc_retvm_if(controller_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL"); - mc_retvm_if(playlist_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "playlist_name is NULL"); - mc_retvm_if(playlist == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "playlist is NULL"); + mc_retvm_if(!controller_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid controller_name"); + mc_retvm_if(!playlist_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid playlist_name"); + mc_retvm_if(!playlist, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid playlist"); is_exist = _mc_db_is_playlist_exist(handle, controller_name, playlist_name); @@ -597,9 +587,8 @@ int _mc_db_get_playlist_item_count(sqlite3 *handle, const char *server_name, cha int count = 0; sqlite3_stmt *stmt = NULL; - mc_retvm_if(handle == NULL, 0, "invalid handle"); - mc_retvm_if(server_name == NULL, 0, "invalid server_name"); - mc_retvm_if(playlist_name == NULL, 0, "invalid playlist_name"); + mc_retvm_if(!server_name, 0, "Invalid server_name"); + mc_retvm_if(!playlist_name, 0, "Invalid playlist_name"); sql_str = sqlite3_mprintf("SELECT COUNT(*) FROM %q WHERE server_name=%Q AND playlist_name=%Q AND item_index IS NOT NULL", MC_DB_TABLE_PLAYLIST, server_name, playlist_name); @@ -620,10 +609,10 @@ int _mc_db_get_playlist_item(sqlite3 *handle, const char *server_name, char *pla char *index = NULL; mc_metadata_h _metadata = NULL; - mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid handle"); - mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid server_name"); - mc_retvm_if(playlist_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid playlist_name"); - mc_retvm_if(callback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid callback"); + mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle"); + mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); + mc_retvm_if(!playlist_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid playlist_name"); + mc_retvm_if(!callback, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid callback"); sql_str = sqlite3_mprintf("SELECT item_index, %s FROM %q WHERE server_name=%Q AND playlist_name=%Q AND item_index IS NOT NULL", META_LIST, MC_DB_TABLE_PLAYLIST, server_name, playlist_name); mc_retvm_if(!MC_STRING_VALID(sql_str), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL string is null"); @@ -663,8 +652,7 @@ gboolean _mc_db_is_exist_server(sqlite3 *handle, const char *server_name) char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(handle == NULL, FALSE, "Handle is NULL"); - mc_retvm_if(server_name == NULL, FALSE, "server_name is NULL"); + mc_retvm_if(!server_name, FALSE, "Invalid server_name"); mc_secure_debug("server_name [%s]", server_name); @@ -691,8 +679,7 @@ gboolean _mc_db_is_activated_client(sqlite3 *handle, const char *client_name) char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(handle == NULL, FALSE, "Handle is NULL"); - mc_retvm_if(client_name == NULL, FALSE, "client_name is NULL"); + mc_retvm_if(!client_name, FALSE, "Invalid client_name"); mc_secure_debug("client name [%s]", client_name); @@ -719,7 +706,6 @@ gboolean _mc_db_is_activated_server(sqlite3 *handle, const char *server_name) char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(!handle, FALSE, "Invalid handle"); mc_retvm_if(!server_name, FALSE, "Invalid server_name"); mc_secure_debug("server name [%s]", server_name); @@ -747,7 +733,6 @@ gboolean _mc_db_is_latest_server(sqlite3 *handle, const char *server_name) char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(!handle, FALSE, "Handle is NULL"); mc_retvm_if(!server_name, FALSE, "server_name is NULL"); mc_secure_debug("server name [%s]", server_name); @@ -770,7 +755,7 @@ int _mc_db_foreach_server_list(sqlite3 *handle, mc_activated_server_cb callback, sqlite3_stmt *stmt = NULL; int idx = 0; - mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); + mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle"); sql_str = sqlite3_mprintf("SELECT name FROM %q WHERE type=%d", MC_DB_TABLE_APP_LIST, MC_PRIV_TYPE_SERVER); mc_retvm_if(!MC_STRING_VALID(sql_str), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL string is null"); @@ -820,7 +805,7 @@ int _mc_db_foreach_client_list(sqlite3 *handle, mc_activated_client_cb callback, sqlite3_stmt *stmt = NULL; int idx = 0; - mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); + mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle"); sql_str = sqlite3_mprintf("SELECT name FROM %q WHERE type=%d", MC_DB_TABLE_APP_LIST, MC_PRIV_TYPE_CLIENT); mc_retvm_if(!MC_STRING_VALID(sql_str), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL string is null"); @@ -951,8 +936,8 @@ int _mc_db_get_int_value(sqlite3 *handle, const char *server_name, const char *c char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle"); mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); + mc_retvm_if(!column, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid column"); mc_retvm_if(!value, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid value"); sql_str = sqlite3_mprintf("SELECT %Q FROM %q WHERE name=%Q", MC_DB_TABLE_SERVER_INFO, column, server_name); @@ -972,7 +957,6 @@ int _mc_db_get_subtitles_enabled(sqlite3 *handle, const char *server_name, bool char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle"); mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); mc_retvm_if(!enabled, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid enabled"); @@ -993,7 +977,6 @@ int _mc_db_get_360_mode_enabled(sqlite3 *handle, const char *server_name, bool * char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle"); mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); mc_retvm_if(!enabled, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid enabled"); @@ -1014,7 +997,6 @@ int _mc_db_get_display_mode(sqlite3 *handle, const char *server_name, mc_display char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle"); mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); mc_retvm_if(!mode, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid mode"); @@ -1035,7 +1017,6 @@ int _mc_db_get_display_rotation(sqlite3 *handle, const char *server_name, mc_dis char *sql_str = NULL; sqlite3_stmt *stmt = NULL; - mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle"); mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); mc_retvm_if(!rotation, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid rotation"); diff --git a/src/media_controller_server.c b/src/media_controller_server.c index cfc3038..5f38f5b 100644 --- a/src/media_controller_server.c +++ b/src/media_controller_server.c @@ -706,18 +706,27 @@ static int __mc_server_send_message(media_controller_server_s *mc_server, const return ret; } +static gboolean __is_valid_parameter(mc_server_h server, const char *client_name) +{ + media_controller_server_s *mc_server = (media_controller_server_s *)server; + + mc_retvm_if(!mc_server, FALSE, "Invalid server"); + mc_retvm_if(!MC_STRING_VALID(client_name), FALSE, "Invalid client_name"); + mc_retvm_if(!_mc_db_is_activated_client(mc_server->db_handle, client_name), FALSE, "Invalid client"); + + return TRUE; +} + static int __mc_server_send_event(mc_server_h server, const char *client_name, const char *command_type, const char *event, const char *signal_name, const char *message, char **request_id) { int ret = MEDIA_CONTROLLER_ERROR_NONE; media_controller_server_s *mc_server = (media_controller_server_s *)server; char *interface_name = NULL; - mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); - mc_retvm_if(!MC_STRING_VALID(client_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); + mc_retvm_if(!__is_valid_parameter(server, client_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter"); mc_retvm_if(!MC_STRING_VALID(command_type), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid command_type"); mc_retvm_if(!MC_STRING_VALID(signal_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid signal_name"); mc_retvm_if(!MC_STRING_VALID(message), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid message"); - mc_retvm_if(_mc_db_is_activated_client(mc_server->db_handle, client_name) == FALSE, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid client_name"); ret = mc_util_set_command_available(MC_PRIV_TYPE_SERVER, mc_server->server_name, command_type, event); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error mc_util_set_command_available [%d]", ret); @@ -1273,8 +1282,7 @@ int mc_server_send_cmd_reply(mc_server_h server, const char *client_name, const char *bundle_str = NULL; 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(!MC_STRING_VALID(client_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "client_name is NULL"); + mc_retvm_if(!__is_valid_parameter(server, client_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter"); mc_retvm_if(!MC_STRING_VALID(request_id), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "request_id is NULL"); ret = mc_util_bundle_to_string(data, &bundle_str); @@ -1312,9 +1320,8 @@ int mc_server_send_custom_event(mc_server_h server, const char *client_name, con char *bundle_str = NULL; 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(!MC_STRING_VALID(client_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid client_name"); - mc_retvm_if(event == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "event is NULL"); + mc_retvm_if(!__is_valid_parameter(server, client_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter"); + mc_retvm_if(!event, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid event"); ret = mc_util_bundle_to_string(data, &bundle_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error when make string from bundle"); @@ -1642,8 +1649,7 @@ int mc_server_send_command_reply(mc_server_h server, const char *client_name, in mc_warning("DEPRECATION WARNING: mc_server_send_command_reply() is removed from 5.5. Use mc_server_send_cmd_reply() instead."); - mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); - mc_retvm_if(!MC_STRING_VALID(client_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "client_name is NULL"); + mc_retvm_if(!__is_valid_parameter(server, client_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter"); ret = mc_util_bundle_to_string(data, &bundle_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error when make string from bundle");