From: hj kim <backto.kim@samsung.com>
Date: Fri, 10 Feb 2023 01:21:32 +0000 (+0900)
Subject: Modify code to initialize data when it is needed
X-Git-Tag: accepted/tizen/7.0/unified/20230303.102026~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=878957aafb07a2131774d080a33b7cbf9a7846a5;p=platform%2Fcore%2Fapi%2Fmedia-controller.git

Modify code to initialize data when it is needed

Change-Id: Ifa177aec2203c11f85b2d3ed66c1b2860a40452c
(cherry picked from commit 815343a319d368dadfc4253be1ec6e9c6a358577)
---

diff --git a/svc/media_controller_svc.c b/svc/media_controller_svc.c
index d0ac6e4..ad079bc 100644
--- a/svc/media_controller_svc.c
+++ b/svc/media_controller_svc.c
@@ -733,14 +733,10 @@ gpointer mc_svc_thread(gpointer data)
 
 	mc_debug_fenter();
 
-	/* Init data */
-	__mc_service_init(&mc_service_data);
-
 	/* Get uid for login user */
 	ret = __mc_sys_get_uid(&uid);
 	if (ret < 0) {
 		mc_debug("Failed to get login user (%d)", ret);
-		__mc_service_deinit(mc_service_data);
 		return NULL;
 	} else {
 		mc_debug("%d sys get UID[%d]", ret, uid);
@@ -760,7 +756,6 @@ gpointer mc_svc_thread(gpointer data)
 	ret = __mc_service_reset_db(uid);
 	if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
 		mc_error("Failed to reset database");
-		__mc_service_deinit(mc_service_data);
 		return NULL;
 	}
 
@@ -768,18 +763,19 @@ gpointer mc_svc_thread(gpointer data)
 	ret = mc_ipc_create_server_socket(MC_DB_UPDATE_PORT, &sockfd);
 	if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
 		mc_error("Failed to create socket");
-		__mc_service_deinit(mc_service_data);
 		return NULL;
 	}
 
 	ret = mc_cynara_enable_credentials_passing(sockfd);
 	if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
 		mc_error("Failed to append socket options");
-		__mc_service_deinit(mc_service_data);
 		close(sockfd);
 		return NULL;
 	}
 
+	/* Init data */
+	__mc_service_init(&mc_service_data);
+
 	/* Register app_dead signal handler */
 	if (aul_listen_app_dead_signal(__mc_service_app_dead_handler, mc_service_data) != AUL_R_OK) {
 		mc_error("Failed to register app_dead signal");