Modify to exit immediately after init failed

[apps/native/ttsd-worker-system.git] / src / controller.c

diff --git a/src/controller.c b/src/controller.c
index 58cfedb..a69cb6a 100644 (file)
--- a/src/controller.c
+++ b/src/controller.c
@@ -25,7 +25,7 @@
 
 #include "log.h"
 #include "controller.h"
-#include "package_worker_report.h"
+#include "system_worker_report.h"
 
 #define SUBMIT_SYNC 0
 #define BUF_MAX 1024
@@ -63,15 +63,13 @@ static void service_app_control(app_control_h app_control, void *data)
 
        app_control_get_extra_data(app_control, "id", &cmd_id);
        if (!cmd_id)
-               service_app_exit();
+               goto ERROR;
 
-       ret = package_worker_report_init(cmd_id);
+       ret = system_worker_report_init(cmd_id);
        if (ret < 0)
-               service_app_exit();
-
-       g_free(cmd_id);
+               goto ERROR;
 
-       package_worker_report_begin_json_object();
+       system_worker_report_begin_json_object();
 
        app_control_get_extra_data(app_control, "system-information", &command);
 
@@ -90,15 +88,15 @@ static void service_app_control(app_control_h app_control, void *data)
 
        g_free(command);
 
-       ret = package_worker_report_end_json_object();
+       ret = system_worker_report_end_json_object();
        goto_if(ret < 0, ERROR);
 
-       report = package_worker_report_get_json_string();
+       report = system_worker_report_get_json_string();
        goto_if(!report, ERROR);
 
        _D("System information: %s", report);
 
-       ret = package_worker_report_submit_report(report, __submit_report_completed_cb, NULL);
+       ret = system_worker_report_submit_report(report, __submit_report_completed_cb, NULL);
        free(report);
        if (ret < 0) {
                _E("Failed to submit report");
@@ -108,7 +106,9 @@ static void service_app_control(app_control_h app_control, void *data)
        return;
 
 ERROR:
-       package_worker_report_fini();
+       g_free(cmd_id);
+
+       system_worker_report_fini();
        service_app_exit();
 }
 
@@ -171,7 +171,7 @@ static int __get_system_info_int(const char *key)
        } else
                buf = g_strdup_printf("%d", val);
 
-       ret = package_worker_report_add_string(key, buf);
+       ret = system_worker_report_add_string(key, buf);
 
        g_free(buf);
 
@@ -195,7 +195,7 @@ static int __get_system_info_bool(const char *key)
                converted_str = val ? "TRUE" : "FALSE";
        }
 
-       ret = package_worker_report_add_string(key, converted_str);
+       ret = system_worker_report_add_string(key, converted_str);
 
        return ret;
 }
@@ -208,10 +208,10 @@ static int __get_system_info_string(const char *key)
        ret = system_info_get_platform_string(key, &val);
        if (ret != SYSTEM_INFO_ERROR_NONE) {
                _E("Failed to get System Info [%s] -- [%s]", key, __check_error_reason(ret));
-               ret = package_worker_report_add_string(key, __check_error_reason(ret));
+               ret = system_worker_report_add_string(key, __check_error_reason(ret));
        } else {
                _D("%s : %s", key, val);
-               ret = package_worker_report_add_string(key, val);
+               ret = system_worker_report_add_string(key, val);
        }
 
        g_free(val);
@@ -274,7 +274,7 @@ static int __get_requested_system_info(const char *key)
        }
        _E("There's no matched key[%s]", key);
 
-       ret = package_worker_report_add_string(key, "There's no matched key");
+       ret = system_worker_report_add_string(key, "There's no matched key");
        if (ret < 0)
           _E("Failed to add string");
 
@@ -314,6 +314,6 @@ static void __submit_report_completed_cb(int result, void *user_data)
        if (result < 0)
                _D("Submit is failed");
 
-       package_worker_report_fini();
+       system_worker_report_fini();
        service_app_exit();
 }