Modify code to initialize data when it is needed

Change-Id: Ifa177aec2203c11f85b2d3ed66c1b2860a40452c

diff --git a/svc/media_controller_svc.c b/svc/media_controller_svc.c
index d0ac6e47f8dc3a085c3a6cb96f929a8b82773fc2..ad079bcf921032b9eff89f7d9ea617b774719995 100644 (file)
--- 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");