From: hj kim Date: Tue, 14 Jan 2020 01:38:41 +0000 (+0900) Subject: Apply Tizen naming convetion for protected(global) functions in internal header X-Git-Tag: submit/tizen/20200115.071738~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F46%2F222346%2F2;p=platform%2Fcore%2Fapi%2Fmedia-controller.git Apply Tizen naming convetion for protected(global) functions in internal header Change-Id: I37dcb730361428ff787b3b36bd2fbdc97b35a2b0 --- diff --git a/include/media_controller_private.h b/include/media_controller_private.h index d30fe12..4bac3c2 100644 --- a/include/media_controller_private.h +++ b/include/media_controller_private.h @@ -427,13 +427,13 @@ typedef struct { } mc_search_item_s; /* util */ -int mc_util_get_own_name(char **name); -char* mc_util_get_interface_name(const char *type, const char *name); -int mc_util_make_filter_interface_name(const char *prefix, const char *filter, char **interface_name); -int mc_util_set_command_available(mc_priv_type_e priv_type, const char *name, const char *command_type, const char *command); -int mc_util_get_command_available(mc_priv_type_e priv_type, const char *name, const char *command_type, const char *command); -char *mc_util_generate_uuid(void); -int mc_util_bundle_to_string(bundle *bundle_data, char **str_data); +int _mc_util_get_own_name(char **name); +char* _mc_util_get_interface_name(const char *type, const char *name); +int _mc_util_make_filter_interface_name(const char *prefix, const char *filter, char **interface_name); +int _mc_util_set_command_available(mc_priv_type_e priv_type, const char *name, const char *command_type, const char *command); +int _mc_util_get_command_available(mc_priv_type_e priv_type, const char *name, const char *command_type, const char *command); +char *_mc_util_generate_uuid(void); +int _mc_util_bundle_to_string(bundle *bundle_data, char **str_data); gboolean _mc_util_is_valid_playback_action(mc_playback_action_e action); gboolean _mc_util_is_valid_subscription_type(const mc_subscription_type_e subscription_type); gboolean _mc_util_is_valid_display_mode(mc_display_mode_e mode); @@ -442,16 +442,16 @@ gboolean _mc_util_is_true_bit(unsigned long long value, int bit_num); const char * _mc_util_replace_null(const char *data); /* for d-bus IPC */ -int mc_ipc_get_dbus_connection(GDBusConnection **conn, int *dref_count); -int mc_ipc_unref_dbus_connection(GDBusConnection *conn, int *dref_count); -int mc_ipc_register_listener(GList **manage_list, GDBusConnection *connection, const char *interface_name, const char *signal_name, mc_signal_received_cb callback, void *user_data); -int mc_ipc_unregister_listener(GList **manage_list, const char *interface_name, const char *signal_name); -int mc_ipc_unregister_all_listener(GList **manage_list); -int mc_ipc_unregister_filter_listener(GList **listener_list, const char *server_name, const char *signal_name); -int mc_ipc_send_message(GDBusConnection *connection, const char *dbus_name, const char *interface_name, const char* signal_name, const char* message, char **request_id); -int mc_ipc_send_reply(GDBusConnection *connection, const char *dbus_name, const char *interface_name, const char *signal_name, const char *message, const char *request_id); -int mc_ipc_send_message_to_server(mc_msg_type_e msg_type, mc_priv_type_e priv_type, const char *request_msg); -int mc_ipc_service_connect(mc_priv_type_e type); +int _mc_ipc_get_dbus_connection(GDBusConnection **conn, int *dref_count); +int _mc_ipc_unref_dbus_connection(GDBusConnection *conn, int *dref_count); +int _mc_ipc_register_listener(GList **manage_list, GDBusConnection *connection, const char *interface_name, const char *signal_name, mc_signal_received_cb callback, void *user_data); +int _mc_ipc_unregister_listener(GList **manage_list, const char *interface_name, const char *signal_name); +int _mc_ipc_unregister_all_listener(GList **manage_list); +int _mc_ipc_unregister_filter_listener(GList **listener_list, const char *server_name, const char *signal_name); +int _mc_ipc_send_message(GDBusConnection *connection, const char *dbus_name, const char *interface_name, const char* signal_name, const char* message, char **request_id); +int _mc_ipc_send_reply(GDBusConnection *connection, const char *dbus_name, const char *interface_name, const char *signal_name, const char *message, const char *request_id); +int _mc_ipc_send_message_to_server(mc_msg_type_e msg_type, mc_priv_type_e priv_type, const char *request_msg); +int _mc_ipc_service_connect(mc_priv_type_e type); int _mc_playlist_update(mc_priv_type_e type, const char *server_name, mc_playlist_h playlist); int _mc_metadata_set(mc_metadata_h metadata, mc_meta_e attribute, const char *value); diff --git a/src/media_controller_client.c b/src/media_controller_client.c index 32d7831..fe9d03c 100644 --- a/src/media_controller_client.c +++ b/src/media_controller_client.c @@ -272,7 +272,7 @@ static void __client_custom_event_received_cb(const char *interface_name, const if (params[0]) sender = strdup(params[0]); - if (mc_util_get_command_available(MC_PRIV_TYPE_CLIENT, sender, MC_EVENT_CUSTOM, params[1]) != MEDIA_CONTROLLER_ERROR_NONE) { + if (_mc_util_get_command_available(MC_PRIV_TYPE_CLIENT, sender, MC_EVENT_CUSTOM, params[1]) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); MC_SAFE_FREE(sender); g_strfreev(params); @@ -469,13 +469,13 @@ static int __mc_client_create(media_controller_client_s **mc_client) _client = (media_controller_client_s *)calloc(1, sizeof(media_controller_client_s)); mc_retvm_if(_client == NULL, MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY, "Error allocation memory"); - ret = mc_util_get_own_name(&(_client->client_name)); + ret = _mc_util_get_own_name(&(_client->client_name)); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { - mc_error("Filed to get client name %d", ret); + mc_error("Filed to _mc_util_get_own_name %d", ret); goto Error; } - ret = mc_ipc_get_dbus_connection(&(_client->dconn), &(_client->dref_count)); + ret = _mc_ipc_get_dbus_connection(&(_client->dconn), &(_client->dref_count)); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("error in client init %d", ret); goto Error; @@ -492,7 +492,7 @@ static int __mc_client_create(media_controller_client_s **mc_client) return MEDIA_CONTROLLER_ERROR_NONE; Error: if (_client->dconn) - mc_ipc_unref_dbus_connection(_client->dconn, &_client->dref_count); + _mc_ipc_unref_dbus_connection(_client->dconn, &_client->dref_count); if (_client->db_handle) mc_db_disconnect(_client->db_handle); @@ -510,14 +510,14 @@ static int __mc_client_destroy(media_controller_client_s *mc_client) mc_retvm_if(mc_client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); /*Send Disconnection Msg to Server*/ - ret = mc_ipc_send_message_to_server(MC_MSG_SERVER_DISCONNECTION, MC_PRIV_TYPE_CLIENT, mc_client->client_name); + ret = _mc_ipc_send_message_to_server(MC_MSG_SERVER_DISCONNECTION, MC_PRIV_TYPE_CLIENT, mc_client->client_name); if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("Failed to mc_ipc_send_message_to_server [%d]", ret); + mc_error("Failed to _mc_ipc_send_message_to_server [%d]", ret); if (mc_client->dconn) { - ret = mc_ipc_unref_dbus_connection(mc_client->dconn, &mc_client->dref_count); + ret = _mc_ipc_unref_dbus_connection(mc_client->dconn, &mc_client->dref_count); if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("fail to mc_ipc_unref_dbus_connection"); + mc_error("fail to _mc_ipc_unref_dbus_connection"); } if (mc_client->db_handle) @@ -539,15 +539,15 @@ static int __mc_client_register_filter_listener(media_controller_client_s *mc_cl mc_debug("signal = [%s]", signal_name); - ret = mc_util_make_filter_interface_name(MC_DBUS_UPDATE_INTERFACE, server_name, &filter_interface_name); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Fail mc_util_make_filter_interface_name"); + ret = _mc_util_make_filter_interface_name(MC_DBUS_UPDATE_INTERFACE, server_name, &filter_interface_name); + mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Fail _mc_util_make_filter_interface_name"); - ret = mc_ipc_register_listener(&mc_client->listeners, mc_client->dconn, filter_interface_name, signal_name, callback, user_data); + ret = _mc_ipc_register_listener(&mc_client->listeners, mc_client->dconn, filter_interface_name, signal_name, callback, user_data); if (ret == MEDIA_CONTROLLER_ERROR_NONE) { char *filter_data = (char *)g_strdup(server_name); if (filter_data == NULL) { mc_debug("memeory allocation failed"); - mc_ipc_unregister_listener(&mc_client->listeners, filter_interface_name, signal_name); + _mc_ipc_unregister_listener(&mc_client->listeners, filter_interface_name, signal_name); MC_SAFE_FREE(filter_interface_name); return MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY; } @@ -576,9 +576,9 @@ static int __mc_client_unregister_filter_listener(media_controller_client_s *mc_ if (MC_STRING_VALID(server_name)) { /* Unregister filter */ - ret = mc_ipc_unregister_filter_listener(&mc_client->listeners, server_name, signal_name); + ret = _mc_ipc_unregister_filter_listener(&mc_client->listeners, server_name, signal_name); if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("Fail mc_ipc_unregister_filter_listener"); + mc_error("Fail _mc_ipc_unregister_filter_listener"); /* Remove from filter_list */ found_item = g_list_find_custom(*filter_list, server_name, __compare_filter); @@ -593,9 +593,9 @@ static int __mc_client_unregister_filter_listener(media_controller_client_s *mc_ for (iter = *filter_list; iter; iter = iter->next) { mc_debug("filter[%s.%s]", (char *)(iter->data), signal_name); - ret = mc_ipc_unregister_filter_listener(&mc_client->listeners, (char *)(iter->data), signal_name); + ret = _mc_ipc_unregister_filter_listener(&mc_client->listeners, (char *)(iter->data), signal_name); if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("Fail mc_ipc_unregister_filter_listener"); + mc_error("Fail _mc_ipc_unregister_filter_listener"); } /* Remove all filters */ @@ -620,14 +620,14 @@ static int __mc_client_send_command(mc_client_h client, const char *server_name, mc_retvm_if(!MC_STRING_VALID(message), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid message"); mc_retvm_if(!_mc_db_is_activated_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); - ret = mc_util_set_command_available(MC_PRIV_TYPE_CLIENT, mc_client->client_name, command_type, command); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error mc_util_set_command_available [%d]", ret); + ret = _mc_util_set_command_available(MC_PRIV_TYPE_CLIENT, mc_client->client_name, command_type, command); + mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to _mc_util_set_command_available [%d]", ret); - interface_name = mc_util_get_interface_name(MC_SERVER, 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); + 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_error("Error _mc_ipc_send_message [%d]", ret); MC_SAFE_G_FREE(interface_name); @@ -644,8 +644,8 @@ int mc_client_create(mc_client_h *client) mc_retvm_if(client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); /*Try Socket Activation by systemd*/ - ret = mc_ipc_service_connect(MC_PRIV_TYPE_CLIENT); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Failed to get mc_ipc_service_connect"); + ret = _mc_ipc_service_connect(MC_PRIV_TYPE_CLIENT); + mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Failed to _mc_ipc_service_connect"); ret = __mc_client_create(&mc_client); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { @@ -691,18 +691,18 @@ static int __mc_client_set_updated_cb(mc_client_h client, mc_client_receive_even #else if ((event == MC_CLIENT_EVENT_CMD_REPLY) || (event == MC_CLIENT_EVENT_SERVER_CUSTOM)) { #endif - interface_name = mc_util_get_interface_name(MC_CLIENT, mc_client->client_name); - ret = mc_ipc_register_listener(&mc_client->listeners, mc_client->dconn, interface_name, cb_event[event].signal_name, + interface_name = _mc_util_get_interface_name(MC_CLIENT, mc_client->client_name); + ret = _mc_ipc_register_listener(&mc_client->listeners, mc_client->dconn, interface_name, cb_event[event].signal_name, cb_event[event].cb_func, (void *)&(mc_client->updated_cb[event])); MC_SAFE_FREE(interface_name); } else if ((event == MC_CLIENT_EVENT_PLAYBACK_INFO) || (event == MC_CLIENT_EVENT_METADATA) || (event == MC_CLIENT_EVENT_PLAYBACK_ABILITY) || (event == MC_CLIENT_EVENT_DISPLAY_MODE_ABILITY) || (event == MC_CLIENT_EVENT_DISPLAY_ROTATION_ABILITY)) { - ret = mc_ipc_register_listener(&mc_client->listeners, mc_client->dconn, MC_DBUS_UPDATE_INTERFACE, cb_event[event].signal_name, + ret = _mc_ipc_register_listener(&mc_client->listeners, mc_client->dconn, MC_DBUS_UPDATE_INTERFACE, cb_event[event].signal_name, cb_event[event].cb_func, (void *)(mc_client)); } else { - ret = mc_ipc_register_listener(&mc_client->listeners, mc_client->dconn, MC_DBUS_UPDATE_INTERFACE, cb_event[event].signal_name, + ret = _mc_ipc_register_listener(&mc_client->listeners, mc_client->dconn, MC_DBUS_UPDATE_INTERFACE, cb_event[event].signal_name, cb_event[event].cb_func, (void *)&(mc_client->updated_cb[event])); } @@ -719,13 +719,13 @@ static int __mc_client_unset_updated_cb(mc_client_h client, mc_client_receive_ev mc_retvm_if(((event < MC_CLIENT_EVENT_SERVER_STATE) || (event >= MC_CLIENT_EVENT_MAX)) , MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid event [%d]", event); if ((event == MC_CLIENT_EVENT_CMD_REPLY) || (event == MC_CLIENT_EVENT_SERVER_CUSTOM)) { - interface_name = mc_util_get_interface_name(MC_CLIENT, mc_client->client_name); + interface_name = _mc_util_get_interface_name(MC_CLIENT, mc_client->client_name); - ret = mc_ipc_unregister_listener(&mc_client->listeners, interface_name, cb_event[event].signal_name); + ret = _mc_ipc_unregister_listener(&mc_client->listeners, interface_name, cb_event[event].signal_name); MC_SAFE_FREE(interface_name); } else { - ret = mc_ipc_unregister_listener(&mc_client->listeners, MC_DBUS_UPDATE_INTERFACE, cb_event[event].signal_name); + ret = _mc_ipc_unregister_listener(&mc_client->listeners, MC_DBUS_UPDATE_INTERFACE, cb_event[event].signal_name); ret = __mc_client_unregister_filter_listener(mc_client, &mc_client->updated_cb[event].filter_list, NULL, cb_event[event].signal_name); } @@ -936,7 +936,7 @@ int mc_client_subscribe(mc_client_h client, const mc_subscription_type_e subscri mc_retvm_if(!_mc_util_is_valid_subscription_type(subscription_type) , MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid subscription_type"); 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); + ret = _mc_ipc_unregister_listener(&mc_client->listeners, MC_DBUS_UPDATE_INTERFACE, cb_event[subscription_type].signal_name); 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) { @@ -1440,7 +1440,7 @@ int mc_client_send_custom_cmd(mc_client_h client, const char *server_name, const 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"); - ret = mc_util_bundle_to_string(data, &bundle_str); + ret = _mc_util_bundle_to_string(data, &bundle_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error when make string from bundle"); message = g_strdup_printf("%s%s%s%s%s", mc_client->client_name, MC_STRING_DELIMITER, command, MC_STRING_DELIMITER, bundle_str); @@ -1490,7 +1490,7 @@ int __mc_client_get_bundle_from_search(mc_search_h search, bundle **res_bundle) goto ERROR; } - ret = mc_util_bundle_to_string(search_item->data, &bundle_str); + ret = _mc_util_bundle_to_string(search_item->data, &bundle_str); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error when encode bundle [%d][%d]", ret, idx); goto ERROR; @@ -1555,7 +1555,7 @@ int mc_client_send_search_cmd(mc_client_h client, const char *server_name, mc_se ret = __mc_client_get_bundle_from_search(search, &bundle_data); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error __mc_client_get_bundle_from_search [%d]", ret); - ret = mc_util_bundle_to_string(bundle_data, &bundle_str); + ret = _mc_util_bundle_to_string(bundle_data, &bundle_str); bundle_free(bundle_data); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error when make string from bundle"); @@ -1581,17 +1581,17 @@ int mc_client_send_event_reply(mc_client_h client, const char *server_name, cons mc_retvm_if(!MC_STRING_VALID(server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL"); 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); + ret = _mc_util_bundle_to_string(data, &bundle_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error when make string from bundle"); message = g_strdup_printf("%s%s%d%s%s", mc_client->client_name, MC_STRING_DELIMITER, result_code, MC_STRING_DELIMITER, bundle_str); MC_SAFE_G_FREE(bundle_str); mc_retvm_if(message == NULL, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "Error when making message"); - char *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); + char *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_error("Error _mc_ipc_send_message [%d]", ret); MC_SAFE_G_FREE(message); MC_SAFE_G_FREE(interface_name); @@ -1673,9 +1673,9 @@ int mc_client_destroy(mc_client_h client) } /*Unregister all listener*/ - ret = mc_ipc_unregister_all_listener(&mc_client->listeners); + ret = _mc_ipc_unregister_all_listener(&mc_client->listeners); if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("Error mc_ipc_unregister_all_listener [%d]", ret); + mc_error("Error _mc_ipc_unregister_all_listener [%d]", ret); ret = __mc_client_destroy(mc_client); @@ -1746,7 +1746,7 @@ int mc_client_send_custom_command(mc_client_h client, const char *server_name, c mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error when __mc_client_set_updated_cb [%d]", ret); } - ret = mc_util_bundle_to_string(data, &bundle_str); + ret = _mc_util_bundle_to_string(data, &bundle_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error when make string from bundle"); message = g_strdup_printf("%s%s%s%s%s", mc_client->client_name, MC_STRING_DELIMITER, command, MC_STRING_DELIMITER, bundle_str); diff --git a/src/media_controller_db.c b/src/media_controller_db.c index a773ea3..9950c56 100644 --- a/src/media_controller_db.c +++ b/src/media_controller_db.c @@ -24,7 +24,7 @@ static int __mc_db_update_db(mc_priv_type_e priv_type, const char *sql_str) { - return mc_ipc_send_message_to_server(MC_MSG_DB_UPDATE, priv_type, sql_str); + return _mc_ipc_send_message_to_server(MC_MSG_DB_UPDATE, priv_type, sql_str); } static int __mc_db_get_record(sqlite3 *handle, char *sql_str, sqlite3_stmt **stmt) diff --git a/src/media_controller_ipc.c b/src/media_controller_ipc.c index c8ef85a..53f09f3 100644 --- a/src/media_controller_ipc.c +++ b/src/media_controller_ipc.c @@ -32,10 +32,10 @@ static int __make_service_connection(mc_priv_type_e priv_type) int ret = MEDIA_CONTROLLER_ERROR_NONE; char *app_id = NULL; - ret = mc_util_get_own_name(&app_id); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Failed to get server_name [%d]", ret); + ret = _mc_util_get_own_name(&app_id); + mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Failed to _mc_util_get_own_name[%d]", ret); - ret = mc_ipc_send_message_to_server(MC_MSG_SERVER_CONNECTION, priv_type, app_id); + ret = _mc_ipc_send_message_to_server(MC_MSG_SERVER_CONNECTION, priv_type, app_id); MC_SAFE_FREE(app_id); @@ -146,7 +146,7 @@ static void _mc_ipc_signal_unsubscribe(GDBusConnection *connection, guint handle g_dbus_connection_signal_unsubscribe(connection, handler); } -int mc_ipc_get_dbus_connection(GDBusConnection **connection, int *dref_count) +int _mc_ipc_get_dbus_connection(GDBusConnection **connection, int *dref_count) { GError *error = NULL; GDBusConnection *_connection = NULL; @@ -170,7 +170,7 @@ int mc_ipc_get_dbus_connection(GDBusConnection **connection, int *dref_count) return MEDIA_CONTROLLER_ERROR_NONE; } -int mc_ipc_unref_dbus_connection(GDBusConnection *connection, int *dref_count) +int _mc_ipc_unref_dbus_connection(GDBusConnection *connection, int *dref_count) { mc_retvm_if(connection == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid connection"); mc_retvm_if(dref_count == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid dref_count"); @@ -192,7 +192,7 @@ int mc_ipc_unref_dbus_connection(GDBusConnection *connection, int *dref_count) return MEDIA_CONTROLLER_ERROR_NONE; } -int mc_ipc_register_listener(GList **listener_list, GDBusConnection *connection, const char *interface_name, const char *signal_name, mc_signal_received_cb callback, void *user_data) +int _mc_ipc_register_listener(GList **listener_list, GDBusConnection *connection, const char *interface_name, const char *signal_name, mc_signal_received_cb callback, void *user_data) { char *key = NULL; @@ -241,7 +241,7 @@ int mc_ipc_register_listener(GList **listener_list, GDBusConnection *connection, return MEDIA_CONTROLLER_ERROR_NONE; } -int mc_ipc_unregister_listener(GList **listener_list, const char *interface_name, const char *signal_name) +int _mc_ipc_unregister_listener(GList **listener_list, const char *interface_name, const char *signal_name) { GList *found_item = NULL; char *key = NULL; @@ -267,7 +267,7 @@ int mc_ipc_unregister_listener(GList **listener_list, const char *interface_name return MEDIA_CONTROLLER_ERROR_NONE; } -int mc_ipc_unregister_all_listener(GList **listener_list) +int _mc_ipc_unregister_all_listener(GList **listener_list) { mc_retvm_if(listener_list == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "listener_list is NULL"); @@ -277,7 +277,7 @@ int mc_ipc_unregister_all_listener(GList **listener_list) return MEDIA_CONTROLLER_ERROR_NONE; } -int mc_ipc_unregister_filter_listener(GList **listener_list, const char *server_name, const char *signal_name) +int _mc_ipc_unregister_filter_listener(GList **listener_list, const char *server_name, const char *signal_name) { int ret = MEDIA_CONTROLLER_ERROR_NONE; char *filter_interface = NULL; @@ -286,10 +286,10 @@ int mc_ipc_unregister_filter_listener(GList **listener_list, const char *server_ mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL"); mc_retvm_if(!signal_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "signal_name is NULL"); - ret = mc_util_make_filter_interface_name(MC_DBUS_UPDATE_INTERFACE, server_name, &filter_interface); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Fail mc_util_make_filter_interface_name"); + ret = _mc_util_make_filter_interface_name(MC_DBUS_UPDATE_INTERFACE, server_name, &filter_interface); + mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Fail _mc_util_make_filter_interface_name"); - ret = mc_ipc_unregister_listener(listener_list, filter_interface, signal_name); + ret = _mc_ipc_unregister_listener(listener_list, filter_interface, signal_name); MC_SAFE_G_FREE(filter_interface); @@ -326,12 +326,12 @@ static int __send_message(GDBusConnection *connection, const char *dbus_name, co return MEDIA_CONTROLLER_ERROR_NONE; } -int mc_ipc_send_message(GDBusConnection *connection, const char *dbus_name, const char *interface_name, const char *signal_name, const char *message, char **request_id) +int _mc_ipc_send_message(GDBusConnection *connection, const char *dbus_name, const char *interface_name, const char *signal_name, const char *message, char **request_id) { const char *req_id = DEFAULT_REQ_ID; if (request_id != NULL) { - req_id = mc_util_generate_uuid(); + req_id = _mc_util_generate_uuid(); *request_id = g_strdup(req_id); mc_secure_debug("req_id[%s]", req_id); @@ -340,12 +340,12 @@ int mc_ipc_send_message(GDBusConnection *connection, const char *dbus_name, cons return __send_message(connection, dbus_name, interface_name, signal_name, message, req_id); } -int mc_ipc_send_reply(GDBusConnection *connection, const char *dbus_name, const char *interface_name, const char *signal_name, const char *message, const char *request_id) +int _mc_ipc_send_reply(GDBusConnection *connection, const char *dbus_name, const char *interface_name, const char *signal_name, const char *message, const char *request_id) { return __send_message(connection, dbus_name, interface_name, signal_name, message, request_id); } -int mc_ipc_send_message_to_server(mc_msg_type_e msg_type, mc_priv_type_e priv_type, const char *request_msg) +int _mc_ipc_send_message_to_server(mc_msg_type_e msg_type, mc_priv_type_e priv_type, const char *request_msg) { int ret = MEDIA_CONTROLLER_ERROR_NONE; int request_msg_size = 0; @@ -460,7 +460,7 @@ int mc_ipc_send_message_to_server(mc_msg_type_e msg_type, mc_priv_type_e priv_ty return ret; } -int mc_ipc_service_connect(mc_priv_type_e priv_type) +int _mc_ipc_service_connect(mc_priv_type_e priv_type) { int ret = MEDIA_CONTROLLER_ERROR_NONE; #ifdef _ON_DEMAND_SOCKET_ACTIVATION @@ -477,7 +477,7 @@ int mc_ipc_service_connect(mc_priv_type_e priv_type) /* If can't make connection to service, the service activation is needed */ /* Create Socket */ - ret = mc_ipc_create_client_socket(MC_TIMEOUT_SEC_5, &sockfd); + ret = _mc_ipc_create_client_socket(MC_TIMEOUT_SEC_5, &sockfd); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "socket is not created properly"); /* Set socket activation address, the path is already created by system */ diff --git a/src/media_controller_server.c b/src/media_controller_server.c index 5f38f5b..08204ce 100644 --- a/src/media_controller_server.c +++ b/src/media_controller_server.c @@ -73,9 +73,9 @@ static int __mc_server_create(media_controller_server_s **mc_server) _server = (media_controller_server_s *)calloc(1, sizeof(media_controller_server_s)); mc_retvm_if(_server == NULL, MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY, "Error allocation memory"); - ret = mc_util_get_own_name(&(_server->server_name)); + ret = _mc_util_get_own_name(&(_server->server_name)); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { - mc_error("Failed to get server_name [%d]", ret); + mc_error("Failed to _mc_util_get_own_name [%d]", ret); goto ERROR; } @@ -95,7 +95,7 @@ static int __mc_server_create(media_controller_server_s **mc_server) _server->basic_ability.decided = (unsigned long)MC_BIT64_UNSET; _server->basic_ability.supported = (unsigned long)MC_BIT64_UNSET; - ret = mc_ipc_get_dbus_connection(&(_server->dconn), &(_server->dref_count)); + ret = _mc_ipc_get_dbus_connection(&(_server->dconn), &(_server->dref_count)); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error allocation memory"); goto ERROR; @@ -113,7 +113,7 @@ static int __mc_server_create(media_controller_server_s **mc_server) ERROR: if (_server->dconn) - mc_ipc_unref_dbus_connection(_server->dconn, &_server->dref_count); + _mc_ipc_unref_dbus_connection(_server->dconn, &_server->dref_count); if (_server->db_handle) mc_db_disconnect(_server->db_handle); @@ -132,14 +132,14 @@ static int __mc_server_destoy(media_controller_server_s *mc_server) mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); /*Send Disconnection Msg to Server*/ - ret = mc_ipc_send_message_to_server(MC_MSG_SERVER_DISCONNECTION, MC_PRIV_TYPE_SERVER, mc_server->server_name); + ret = _mc_ipc_send_message_to_server(MC_MSG_SERVER_DISCONNECTION, MC_PRIV_TYPE_SERVER, mc_server->server_name); if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("Failed to mc_ipc_send_message_to_server [%d]", ret); + mc_error("Failed to _mc_ipc_send_message_to_server [%d]", ret); if (mc_server->dconn) { - ret = mc_ipc_unref_dbus_connection(mc_server->dconn, &mc_server->dref_count); + ret = _mc_ipc_unref_dbus_connection(mc_server->dconn, &mc_server->dref_count); if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("fail to mc_ipc_unref_dbus_connection"); + mc_error("fail to _mc_ipc_unref_dbus_connection"); } if (mc_server->db_handle) @@ -176,7 +176,7 @@ static void __server_playback_action_cb(const char *interface_name, const char * params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid playback_action command"); - if (mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_PLAYBACKACTION, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { + if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_PLAYBACKACTION, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); g_strfreev(params); return; @@ -210,7 +210,7 @@ static void __server_playback_position_cmd_cb(const char *interface_name, const params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid playback_position command"); - if (mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_PLAYBACKPOSITION, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { + if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_PLAYBACKPOSITION, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); g_strfreev(params); return; @@ -244,7 +244,7 @@ static void __server_shuffle_mode_cmd_cb(const char *interface_name, const char params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid shuffle_mode command"); - if (mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_SHUFFLE, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { + if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_SHUFFLE, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); g_strfreev(params); return; @@ -278,7 +278,7 @@ static void __server_repeat_mode_cmd_cb(const char *interface_name, const char * params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid repeat_mode command"); - if (mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_REPEAT, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { + if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_REPEAT, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); g_strfreev(params); return; @@ -313,7 +313,7 @@ static void __server_play_playlist_cmd_cb(const char *interface_name, const char params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid play_playlist command"); - if (mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_PLAY_PLAYLIST, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { + if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_PLAY_PLAYLIST, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); g_strfreev(params); return; @@ -359,7 +359,7 @@ static void __server_custom_cmd_cb(const char *interface_name, const char *signa if (params[0]) sender = strdup(params[0]); - if (mc_util_get_command_available(MC_PRIV_TYPE_SERVER, sender, MC_COMMAND_CUSTOMACTION, params[1]) != MEDIA_CONTROLLER_ERROR_NONE) { + if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, sender, MC_COMMAND_CUSTOMACTION, params[1]) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); MC_SAFE_FREE(sender); g_strfreev(params); @@ -496,7 +496,7 @@ static void __server_search_cmd_cb(const char *interface_name, const char *signa params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid search data"); - if (mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_SEARCH, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { + if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_SEARCH, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); g_strfreev(params); return; @@ -560,13 +560,13 @@ static void __server_enable_cmd_cb(const char *interface_name, const char *signa mc_retm_if(params == NULL, "invalid command"); 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) { + if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_SUBTITLES, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied for subtitles"); g_strfreev(params); return; } } else if (!strncmp(signal_name, MC_DBUS_SIGNAL_NAME_360, strlen(MC_DBUS_SIGNAL_NAME_360))) { - if (mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_360, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { + if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_360, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied for 360"); g_strfreev(params); return; @@ -606,7 +606,7 @@ static void __server_display_mode_cb(const char *interface_name, const char *sig params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid display mode command"); - if (mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_DISPLAYMODE, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { + if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_DISPLAYMODE, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); g_strfreev(params); return; @@ -641,7 +641,7 @@ static void __server_display_rotation_cb(const char *interface_name, const char params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid display rotation command"); - if (mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_DISPLAYROTATION, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { + if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_DISPLAYROTATION, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); g_strfreev(params); return; @@ -683,21 +683,21 @@ static int __mc_server_send_message(media_controller_server_s *mc_server, const mc_retvm_if(!message, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "Invalid message"); - ret = mc_ipc_send_message(mc_server->dconn, NULL, interface_name, signal_name, message, NULL); + ret = _mc_ipc_send_message(mc_server->dconn, NULL, interface_name, signal_name, message, NULL); if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("Error mc_ipc_send_message [%d]", ret); + mc_error("Error _mc_ipc_send_message [%d]", ret); mc_secure_debug("interface_name[%s] signal_name[%s] message[%s]", interface_name, signal_name, message); /*Send again for the subscriber which receive filtered msg with server_name*/ char *filter_interface_name = NULL; - ret = mc_util_make_filter_interface_name(interface_name, mc_server->server_name, &filter_interface_name); + ret = _mc_util_make_filter_interface_name(interface_name, mc_server->server_name, &filter_interface_name); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { - mc_error("Error mc_util_make_interface_name [%d]", ret); + mc_error("Error _mc_util_make_filter_interface_name [%d]", ret); } else { - ret = mc_ipc_send_message(mc_server->dconn, NULL, filter_interface_name, signal_name, message, NULL); + ret = _mc_ipc_send_message(mc_server->dconn, NULL, filter_interface_name, signal_name, message, NULL); if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("Error mc_ipc_send_message [%d]", ret); + mc_error("Error _mc_ipc_send_message [%d]", ret); } MC_SAFE_G_FREE(filter_interface_name); @@ -728,14 +728,14 @@ static int __mc_server_send_event(mc_server_h server, const char *client_name, c 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"); - 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); + 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, "fail to _mc_util_set_command_available [%d]", ret); - interface_name = mc_util_get_interface_name(MC_CLIENT, client_name); + 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); + 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_error("Error _mc_ipc_send_message [%d]", ret); MC_SAFE_G_FREE(interface_name); @@ -1125,9 +1125,9 @@ static int __mc_server_set_updated_cb(mc_server_h server, mc_server_receive_even mc_server->updated_cb[event].callback = callback; mc_server->updated_cb[event].user_data = user_data; - interface_name = mc_util_get_interface_name(MC_SERVER, mc_server->server_name); + interface_name = _mc_util_get_interface_name(MC_SERVER, mc_server->server_name); - ret = mc_ipc_register_listener(&mc_server->listeners, mc_server->dconn, interface_name, cb_event[event].signal_name, cb_event[event].cb_func, (void *)&(mc_server->updated_cb[event])); + ret = _mc_ipc_register_listener(&mc_server->listeners, mc_server->dconn, interface_name, cb_event[event].signal_name, cb_event[event].cb_func, (void *)&(mc_server->updated_cb[event])); MC_SAFE_FREE(interface_name); @@ -1143,9 +1143,9 @@ static int __mc_server_unset_updated_cb(mc_server_h server, mc_server_receive_ev mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); mc_retvm_if(((event < MC_SERVER_EVENT_PLAYBACK_ACTION) || (event >= MC_SERVER_EVENT_MAX)) , MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid event [%d]", event); - interface_name = mc_util_get_interface_name(MC_SERVER, mc_server->server_name); + interface_name = _mc_util_get_interface_name(MC_SERVER, mc_server->server_name); - ret = mc_ipc_unregister_listener(&mc_server->listeners, interface_name, cb_event[event].signal_name); + ret = _mc_ipc_unregister_listener(&mc_server->listeners, interface_name, cb_event[event].signal_name); mc_server->updated_cb[event].callback = NULL; mc_server->updated_cb[event].user_data = NULL; @@ -1285,17 +1285,17 @@ int mc_server_send_cmd_reply(mc_server_h server, const char *client_name, const 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); + ret = _mc_util_bundle_to_string(data, &bundle_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error when make string from bundle"); message = g_strdup_printf("%s%s%d%s%s", mc_server->server_name, MC_STRING_DELIMITER, result_code, MC_STRING_DELIMITER, bundle_str); MC_SAFE_G_FREE(bundle_str); mc_retvm_if(message == NULL, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "Error when making message"); - char *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); + char *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_error("Error _mc_ipc_send_message [%d]", ret); MC_SAFE_G_FREE(message); MC_SAFE_G_FREE(interface_name); @@ -1323,7 +1323,7 @@ int mc_server_send_custom_event(mc_server_h server, const char *client_name, con 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); + ret = _mc_util_bundle_to_string(data, &bundle_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error when make string from bundle"); message = g_strdup_printf("%s%s%s%s%s", mc_server->server_name, MC_STRING_DELIMITER, event, MC_STRING_DELIMITER, bundle_str); @@ -1506,8 +1506,8 @@ int mc_server_create(mc_server_h *server) mc_retvm_if(server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is null"); /*Try Socket Activation by systemd*/ - ret = mc_ipc_service_connect(MC_PRIV_TYPE_SERVER); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Failed to get mc_ipc_service_connect"); + ret = _mc_ipc_service_connect(MC_PRIV_TYPE_SERVER); + mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Failed to _mc_ipc_service_connect"); ret = __mc_server_create(&mc_server); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { @@ -1541,9 +1541,9 @@ int mc_server_destroy(mc_server_h server) mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); - ret = mc_ipc_unregister_all_listener(&mc_server->listeners); + 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 _mc_ipc_unregister_all_listener [%d]", ret); ret = __mc_server_send_message(mc_server, MC_DBUS_UPDATE_INTERFACE, MC_DBUS_SIGNAL_NAME_SERVER_STATE, MC_SERVER_STATE_DEACTIVATE, 0, NULL); if (ret != MEDIA_CONTROLLER_ERROR_NONE) @@ -1580,7 +1580,7 @@ static void __server_playback_state_command_cb(const char *interface_name, const params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid playback state command"); - if (mc_util_get_command_available(MC_PRIV_TYPE_SERVER, params[0], MC_COMMAND_PLAYBACKSTATE, NULL) != MEDIA_CONTROLLER_ERROR_NONE) { + 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"); g_strfreev(params); return; @@ -1620,7 +1620,7 @@ static void __server_custom_command_cb(const char *interface_name, const char *s if (params[0]) sender = strdup(params[0]); - if (mc_util_get_command_available(MC_PRIV_TYPE_SERVER, sender, MC_COMMAND_CUSTOM, params[1]) != MEDIA_CONTROLLER_ERROR_NONE) { + if (_mc_util_get_command_available(MC_PRIV_TYPE_SERVER, sender, MC_COMMAND_CUSTOM, params[1]) != MEDIA_CONTROLLER_ERROR_NONE) { mc_error("Error permission denied"); MC_SAFE_FREE(sender); g_strfreev(params); @@ -1651,17 +1651,17 @@ int mc_server_send_command_reply(mc_server_h server, const char *client_name, in 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); + ret = _mc_util_bundle_to_string(data, &bundle_str); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error when make string from bundle"); message = g_strdup_printf("%s%s%d%s%s", mc_server->server_name, MC_STRING_DELIMITER, result_code, MC_STRING_DELIMITER, bundle_str); MC_SAFE_G_FREE(bundle_str); mc_retvm_if(message == NULL, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "Error when making message"); - char *interface_name = mc_util_get_interface_name(MC_CLIENT, client_name); - ret = mc_ipc_send_message(mc_server->dconn, NULL, interface_name, MC_DBUS_SIGNAL_NAME_CUSTOM_COMMAND_REPLY, message, NULL); + char *interface_name = _mc_util_get_interface_name(MC_CLIENT, client_name); + ret = _mc_ipc_send_message(mc_server->dconn, NULL, interface_name, MC_DBUS_SIGNAL_NAME_CUSTOM_COMMAND_REPLY, message, NULL); if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("Error mc_ipc_send_message [%d]", ret); + mc_error("Error _mc_ipc_send_message [%d]", ret); MC_SAFE_G_FREE(message); MC_SAFE_G_FREE(interface_name); diff --git a/src/media_controller_util.c b/src/media_controller_util.c index 717e76c..5027b62 100644 --- a/src/media_controller_util.c +++ b/src/media_controller_util.c @@ -24,7 +24,7 @@ //#define UNIT_TEST /* for testsuite */ #define MAX_NAME_LENGTH 255 -static void _mc_util_check_valid_name(const char *name, char **valid_name) +static void __mc_util_check_valid_name(const char *name, char **valid_name) { char old_word[MAX_NAME_LENGTH] = {0, }; char new_word[MAX_NAME_LENGTH] = {0, }; @@ -67,7 +67,7 @@ static void _mc_util_check_valid_name(const char *name, char **valid_name) mc_retm_if((*valid_name) == NULL, "Error allocation memory."); } -int mc_util_get_own_name(char **name) +int _mc_util_get_own_name(char **name) { char temp[MAX_NAME_LENGTH] = {0, }; int pid = -1; @@ -97,7 +97,7 @@ int mc_util_get_own_name(char **name) return MEDIA_CONTROLLER_ERROR_NONE; } -char *mc_util_get_interface_name(const char *type, const char *name) +char *_mc_util_get_interface_name(const char *type, const char *name) { char *temp = NULL; char *interface_name = NULL; @@ -107,13 +107,13 @@ char *mc_util_get_interface_name(const char *type, const char *name) temp = g_strdup_printf("%s.%s%s", MC_DBUS_INTERFACE_PREFIX, type, name); - _mc_util_check_valid_name(temp, &interface_name); + __mc_util_check_valid_name(temp, &interface_name); MC_SAFE_G_FREE(temp); return interface_name; } -int mc_util_make_filter_interface_name(const char *prefix, const char *filter, char **interface_name) +int _mc_util_make_filter_interface_name(const char *prefix, const char *filter, char **interface_name) { char *temp = NULL; @@ -127,7 +127,7 @@ int mc_util_make_filter_interface_name(const char *prefix, const char *filter, c return MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY; } - _mc_util_check_valid_name(temp, interface_name); + __mc_util_check_valid_name(temp, interface_name); MC_SAFE_G_FREE(temp); @@ -149,24 +149,24 @@ static int __send_command_available(mc_priv_type_e priv_type, const char *name, else message = g_strdup_printf("%s%s%s", name, command_type, command); - ret = mc_ipc_send_message_to_server(msg_type, priv_type, message); + ret = _mc_ipc_send_message_to_server(msg_type, priv_type, message); MC_SAFE_G_FREE(message); return ret; } -int mc_util_set_command_available(mc_priv_type_e priv_type, const char *name, const char *command_type, const char *command) +int _mc_util_set_command_available(mc_priv_type_e priv_type, const char *name, const char *command_type, const char *command) { return __send_command_available(priv_type, name, command_type, command, MC_MSG_CLIENT_SET); } -int mc_util_get_command_available(mc_priv_type_e priv_type, const char *name, const char *command_type, const char *command) +int _mc_util_get_command_available(mc_priv_type_e priv_type, const char *name, const char *command_type, const char *command) { return __send_command_available(priv_type, name, command_type, command, MC_MSG_CLIENT_GET); } -char *mc_util_generate_uuid(void) +char *_mc_util_generate_uuid(void) { uuid_t uuid_value; static char uuid_unparsed[37]; @@ -183,7 +183,7 @@ RETRY_GEN: return uuid_unparsed; } -int mc_util_bundle_to_string(bundle *bundle_data, char **str_data) +int _mc_util_bundle_to_string(bundle *bundle_data, char **str_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; int size_r = 0;