From: Haejeong Kim Date: Thu, 21 Sep 2017 07:02:21 +0000 (+0900) Subject: Change strcmp to g_strcmp0 X-Git-Tag: submit/tizen/20170922.060558~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9d78b8f231af62b9f18398e367afafffb7ed5a7;p=platform%2Fcore%2Fapi%2Fmedia-controller.git Change strcmp to g_strcmp0 Change-Id: Ib3d05c3b262112e95dbdbe0c3f713e259e761cb2 --- diff --git a/src/media_controller_client.c b/src/media_controller_client.c index e300333..d5742dd 100755 --- a/src/media_controller_client.c +++ b/src/media_controller_client.c @@ -296,7 +296,7 @@ static int __mc_client_unregister_filter_listener(media_controller_client_s *mc_ interface_name = g_list_nth_data(*filter_list, idx); if (MC_STRING_VALID(interface_name)) { - if (strcmp(interface_name, filter_interface_name) == 0) { + if (g_strcmp0(interface_name, filter_interface_name) == 0) { mc_debug("Unset subscriber [%d][%s]", idx, interface_name); *filter_list = g_list_remove(*filter_list, interface_name); MC_SAFE_FREE(interface_name); diff --git a/src/media_controller_ipc.c b/src/media_controller_ipc.c index 313c501..e7bc4aa 100755 --- a/src/media_controller_ipc.c +++ b/src/media_controller_ipc.c @@ -69,7 +69,7 @@ static void __mc_ipc_signal_cb(GDBusConnection *connection, unsigned int listener_cnt = g_list_length(listener_list); for (i = 0; i < listener_cnt; i++) { listener = (mc_ipc_listener_s *)g_list_nth_data(listener_list, i); - if (listener && !strcmp(listener->key, key)) { + if (listener && !g_strcmp0(listener->key, key)) { mc_debug("Received : [%s] (flags = %x) from %s.%s", message, internal_flags, listener->interface_name, listener->signal_name); listener->callback(listener->interface_name, listener->signal_name, message, 0, listener->user_data); } @@ -81,9 +81,11 @@ static gboolean _mc_ipc_is_listener_duplicated(GList *listener_list, const char { unsigned int i = 0; + mc_retvm_if(!MC_STRING_VALID(key), TRUE, "Invalid Key"); + for (i = 0; i < g_list_length(listener_list); i++) { mc_ipc_listener_s *listener = (mc_ipc_listener_s *)g_list_nth_data((listener_list), i); - mc_retvm_if(listener && !strcmp(listener->key, key), TRUE, "listener[%s] is duplicated ", key); + mc_retvm_if(listener && !g_strcmp0(listener->key, key), TRUE, "listener[%s] is duplicated ", key); } return FALSE; @@ -228,7 +230,7 @@ int mc_ipc_unregister_listener(GList *listener_list, GDBusConnection *connection for (i = g_list_length(listener_list) - 1; i >= 0; i--) { mc_ipc_listener_s *listener = (mc_ipc_listener_s *)g_list_nth_data(listener_list, i); - if (listener && !strcmp(listener->key, key)) { + if (listener && !g_strcmp0(listener->key, key)) { _mc_ipc_signal_unsubscribe(connection, listener->handler); MC_SAFE_FREE(listener->interface_name); MC_SAFE_FREE(listener->signal_name); diff --git a/src/media_controller_server.c b/src/media_controller_server.c index fad91f2..893aef3 100755 --- a/src/media_controller_server.c +++ b/src/media_controller_server.c @@ -189,7 +189,7 @@ static int __mc_server_current_is_latest(media_controller_server_s *mc_server, b } if ((latest_server_name != NULL) && (mc_server->server_name != NULL)) { - if (!strcmp(latest_server_name, mc_server->server_name)) + if (!g_strcmp0(latest_server_name, mc_server->server_name)) *is_latest = TRUE; } @@ -206,9 +206,9 @@ static int __mc_server_send_message(media_controller_server_s *mc_server, const mc_retvm_if(interface_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "interface_name is NULL"); mc_retvm_if(signal_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "signal_name is NULL"); - if (!strcmp(MC_DBUS_SIGNAL_NAME_PLAY_BACK, signal_name)) + if (!g_strcmp0(MC_DBUS_SIGNAL_NAME_PLAY_BACK, signal_name)) message = g_strdup_printf("%s%s%d%s%llu", mc_server->server_name, MC_STRING_DELIMITER, param1, MC_STRING_DELIMITER, param2); - else if (!strcmp(MC_DBUS_SIGNAL_NAME_METADATA, signal_name)) + else if (!g_strcmp0(MC_DBUS_SIGNAL_NAME_METADATA, signal_name)) message = g_strdup_printf("%s", mc_server->server_name); else message = g_strdup_printf("%s%s%d", mc_server->server_name, MC_STRING_DELIMITER, param1);