From 1e1a4fda48bbb5d347e0faed14f108129f4d9413 Mon Sep 17 00:00:00 2001
From: "jiyong.min" <jiyong.min@samsung.com>
Date: Wed, 11 Mar 2020 13:32:25 +0900
Subject: [PATCH] Remove redundant static function

Change-Id: I952404ccd78ba7eca9c1aae678f9b25c795b6bd2
---
 include/media_controller_private.h |  8 -----
 src/media_controller_ipc.c         | 71 +++++++++++++++++---------------------
 2 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/include/media_controller_private.h b/include/media_controller_private.h
index ea038f6..9cb0cbc 100644
--- a/include/media_controller_private.h
+++ b/include/media_controller_private.h
@@ -413,14 +413,6 @@ typedef struct {
 typedef void(*mc_signal_received_cb)(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data);
 
 typedef struct {
-	GDBusConnection			*dbus_conn;
-	mc_signal_received_cb	callback;
-	char					*user_data;
-	guint					handler;
-	char					*key;
-} mc_ipc_listener_s;
-
-typedef struct {
 	const char *signal_name;
 	mc_signal_received_cb cb_func;
 } mc_cb_event_s;
diff --git a/src/media_controller_ipc.c b/src/media_controller_ipc.c
index beea1e7..c4fe3e1 100644
--- a/src/media_controller_ipc.c
+++ b/src/media_controller_ipc.c
@@ -24,7 +24,13 @@
 #define MAX_WAIT_COUNT 100
 #define DEFAULT_REQ_ID "DEF_REQ_ID"
 
-static void _mc_ipc_signal_unsubscribe(GDBusConnection *connection, guint handler);
+typedef struct {
+	GDBusConnection			*dbus_conn;
+	mc_signal_received_cb	callback;
+	char					*user_data;
+	guint					handler;
+	char					*key;
+} mc_ipc_listener_s;
 
 /* This checks if service daemon is running */
 static int __make_service_connection(mc_priv_type_e priv_type)
@@ -99,12 +105,12 @@ static void __mc_ipc_signal_cb(GDBusConnection *connection,
 static void __mc_destroy_listener(gpointer data)
 {
 	mc_ipc_listener_s *listener = (mc_ipc_listener_s *)data;
-	if (listener) {
-		mc_debug("listener[%s] will be unregistered.", listener->key);
-		_mc_ipc_signal_unsubscribe(listener->dbus_conn, listener->handler);
-		MC_SAFE_G_FREE(listener->key);
-		MC_SAFE_FREE(listener);
-	}
+	if (!listener)
+		return;
+	mc_debug("listener[%s] will be unregistered.", listener->key);
+	g_dbus_connection_signal_unsubscribe(listener->dbus_conn, listener->handler);
+	MC_SAFE_G_FREE(listener->key);
+	MC_SAFE_FREE(listener);
 }
 
 static gboolean _mc_ipc_is_listener_duplicated(GList *listener_list, const char *key)
@@ -119,31 +125,6 @@ static gboolean _mc_ipc_is_listener_duplicated(GList *listener_list, const char
 	return FALSE;
 }
 
-static guint _mc_ipc_signal_subscribe(GDBusConnection *connection, const char *interface_name, const char *signal_name, void *user_data)
-{
-	guint ret = g_dbus_connection_signal_subscribe(
-				connection,
-				NULL,
-				interface_name,
-				signal_name,
-				MC_DBUS_PATH,
-				NULL,
-				G_DBUS_SIGNAL_FLAGS_NONE,
-				__mc_ipc_signal_cb,
-				user_data,
-				NULL);
-
-	return ret;
-}
-
-static void _mc_ipc_signal_unsubscribe(GDBusConnection *connection, guint handler)
-{
-	mc_retm_if(connection == NULL, "invalid connection");
-	mc_retm_if(handler == 0, "invalid handler");
-
-	g_dbus_connection_signal_unsubscribe(connection, handler);
-}
-
 int _mc_ipc_get_dbus_connection(GDBusConnection **connection, int *dref_count)
 {
 	GError *error = NULL;
@@ -210,26 +191,36 @@ int _mc_ipc_register_listener(GList **listener_list, GDBusConnection *connection
 		return MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER;
 	}
 
-	mc_ipc_listener_s *listener = (mc_ipc_listener_s *)g_malloc(sizeof(mc_ipc_listener_s));
+	mc_ipc_listener_s *listener = (mc_ipc_listener_s *)calloc(1, sizeof(__dbus_listener_s));
 	if (listener == NULL) {
 		mc_error("Error memroy allocation");
 		MC_SAFE_G_FREE(key);
 		return MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY;
 	}
 
-	listener->handler = _mc_ipc_signal_subscribe(connection, interface_name, signal_name, listener_list);
+	listener->dbus_conn = connection;
+	listener->callback = callback;
+	listener->user_data = user_data;
+	listener->key = key;
+	listener->handler = g_dbus_connection_signal_subscribe(
+				connection,
+				NULL,
+				interface_name,
+				signal_name,
+				MC_DBUS_PATH,
+				NULL,
+				G_DBUS_SIGNAL_FLAGS_NONE,
+				(GDBusSignalCallback)__mc_ipc_signal_cb,
+				(gpointer)listener_list,
+				NULL);
+
 	if (listener->handler == 0) {
 		mc_error("Error signal subscribe");
 		MC_SAFE_G_FREE(key);
-		MC_SAFE_G_FREE(listener);
+		MC_SAFE_FREE(listener);
 		return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
 	}
 
-	listener->dbus_conn = connection;
-	listener->callback = callback;
-	listener->user_data = user_data;
-	listener->key = key;
-
 	(*listener_list) = g_list_append(*listener_list, listener);
 
 	mc_debug("listener[%s] is registered. listener_cnt[%d]", key, g_list_length(*listener_list));
-- 
2.7.4