From: hj kim <backto.kim@samsung.com>
Date: Tue, 15 Dec 2020 06:45:35 +0000 (+0900)
Subject: Update code to reduce complexity
X-Git-Tag: accepted/tizen/unified/20201224.151547~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45c244d30f539b0e25085e2f49fe759bf1ca98a9;p=platform%2Fcore%2Fapi%2Fmedia-controller.git

Update code to reduce complexity

Change-Id: I7f2327939287fced4d0b2da1dba6d17d8fd7ebee
---

diff --git a/src/media_controller_ipc.c b/src/media_controller_ipc.c
index cc73c41..3ad7019 100644
--- a/src/media_controller_ipc.c
+++ b/src/media_controller_ipc.c
@@ -440,21 +440,12 @@ int _mc_ipc_send_message_to_server(mc_msg_type_e msg_type, mc_priv_type_e priv_t
 	return ret;
 }
 
-int _mc_ipc_service_connect(mc_priv_type_e priv_type)
+#ifdef _ON_DEMAND_SOCKET_ACTIVATION
+static int __activate_service(void)
 {
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
-#ifdef _ON_DEMAND_SOCKET_ACTIVATION
 	int sockfd = -1;
 	struct sockaddr_un serv_addr;
-	unsigned int retry_count = 0;
-#endif
-
-	ret = __make_service_connection(priv_type);
-	mc_retvm_if(ret == MEDIA_CONTROLLER_ERROR_NONE, ret, "service is already running!");
-	mc_retvm_if(ret == MEDIA_CONTROLLER_ERROR_PERMISSION_DENIED, ret, "Permission deny!");
-
-#ifdef _ON_DEMAND_SOCKET_ACTIVATION
-	/* 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);
@@ -474,6 +465,25 @@ int _mc_ipc_service_connect(mc_priv_type_e priv_type)
 
 	close(sockfd);
 
+	return MEDIA_CONTROLLER_ERROR_NONE;
+}
+#endif
+
+int _mc_ipc_service_connect(mc_priv_type_e priv_type)
+{
+	int ret = MEDIA_CONTROLLER_ERROR_NONE;
+#ifdef _ON_DEMAND_SOCKET_ACTIVATION
+	unsigned int retry_count = 0;
+#endif
+
+	ret = __make_service_connection(priv_type);
+	mc_retvm_if(ret == MEDIA_CONTROLLER_ERROR_NONE, ret, "service is already running!");
+	mc_retvm_if(ret == MEDIA_CONTROLLER_ERROR_PERMISSION_DENIED, ret, "Permission deny!");
+
+#ifdef _ON_DEMAND_SOCKET_ACTIVATION
+	ret = __activate_service();
+	mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Fail to __activate_service");
+
 	ret = __make_service_connection(priv_type);
 	mc_retvm_if(ret == MEDIA_CONTROLLER_ERROR_PERMISSION_DENIED, ret, "Permission deny!");