Modify to exit immediately after init failed

Change-Id: Ic7a1b939b7a3d2bf07dbc10f39ba384033a41586

diff --git a/include/package_worker_report.h b/include/system_worker_report.h
similarity index 55%
rename from include/package_worker_report.h
rename to include/system_worker_report.h
index 50d1698..c08e159 100644 (file)
--- a/include/package_worker_report.h
+++ b/include/system_worker_report.h
@@ -16,23 +16,23 @@
  * limitations under the License.
  */
 
-#ifndef __PACKAGE_WORKER_REPORT_H__
-#define __PACKAGE_WORKER_REPORT_H__
+#ifndef __SYSTEM_WORKER_REPORT_H__
+#define __SYSTEM_WORKER_REPORT_H__
 
 #include <stdbool.h>
 
 typedef void(*report_completed_cb)(int result, void *user_data);
 
-int package_worker_report_init(const char *cmd_id);
-void package_worker_report_fini(void);
-int package_worker_report_begin_json_object(void);
-int package_worker_report_end_json_object(void);
-int package_worker_report_add_int(const char *key, long long int value);
-int package_worker_report_add_boolean(const char *key, bool value);
-int package_worker_report_add_string(const char *key, const char *value);
-char *package_worker_report_get_json_string(void);
-int package_worker_report_submit_report(const char *report,
+int system_worker_report_init(const char *cmd_id);
+void system_worker_report_fini(void);
+int system_worker_report_begin_json_object(void);
+int system_worker_report_end_json_object(void);
+int system_worker_report_add_int(const char *key, long long int value);
+int system_worker_report_add_boolean(const char *key, bool value);
+int system_worker_report_add_string(const char *key, const char *value);
+char *system_worker_report_get_json_string(void);
+int system_worker_report_submit_report(const char *report,
                report_completed_cb completed_cb, void *cb_data);
 
-#endif /* __PACKAGE_WORKER_REPORT_H__ */
+#endif /* __SYSTEM_WORKER_REPORT_H__ */
 

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();
 }

diff --git a/src/package_worker_report.c b/src/system_worker_report.c
similarity index 84%
rename from src/package_worker_report.c
rename to src/system_worker_report.c
index 9a506a9..178919c 100644 (file)
--- a/src/package_worker_report.c
+++ b/src/system_worker_report.c
@@ -21,7 +21,7 @@
 #include <ttd-worker-lib.h>
 #include <json-glib/json-glib.h>
 
-#include "package_worker_report.h"
+#include "system_worker_report.h"
 #include "log.h"
 
 typedef struct __report_h {
@@ -35,14 +35,14 @@ typedef struct __report_h {
 
 static _report_h *report_h = NULL;
 
-int package_worker_report_init(const char *cmd_id)
+int system_worker_report_init(const char *cmd_id)
 {
        retv_if(!cmd_id, -1);
 
        if (report_h)
-               package_worker_report_fini();
+               system_worker_report_fini();
 
-       report_h = g_try_malloc0(sizeof(report_h));
+       report_h = g_try_malloc0(sizeof(_report_h));
        retv_if(!report_h, -1);
 
        report_h->report = ttd_worker_report_new_by_cmd_id(cmd_id);
@@ -61,12 +61,12 @@ int package_worker_report_init(const char *cmd_id)
        return 0;
 
 ERROR:
-       package_worker_report_fini();
+       system_worker_report_fini();
 
        return -1;
 }
 
-void package_worker_report_fini(void)
+void system_worker_report_fini(void)
 {
        ttd_worker_report_free(report_h->report);
 
@@ -78,7 +78,7 @@ void package_worker_report_fini(void)
        report_h = NULL;
 }
 
-int package_worker_report_begin_json_object(void)
+int system_worker_report_begin_json_object(void)
 {
        retv_if(!report_h, -1);
        retv_if(!report_h->builder, -1);
@@ -91,7 +91,7 @@ int package_worker_report_begin_json_object(void)
        return 0;
 }
 
-int package_worker_report_end_json_object(void)
+int system_worker_report_end_json_object(void)
 {
        retv_if(!report_h, -1);
        retv_if(!report_h->builder, -1);
@@ -104,7 +104,7 @@ int package_worker_report_end_json_object(void)
        return 0;
 }
 
-int package_worker_report_add_int(const char* key, long long int value)
+int system_worker_report_add_int(const char* key, long long int value)
 {
        retv_if(!key, -1);
        retv_if(!report_h, -1);
@@ -119,7 +119,7 @@ int package_worker_report_add_int(const char* key, long long int value)
        return 0;
 }
 
-int package_worker_report_add_boolean(const char* key, bool value)
+int system_worker_report_add_boolean(const char* key, bool value)
 {
        retv_if(!key, -1);
        retv_if(!report_h, -1);
@@ -134,7 +134,7 @@ int package_worker_report_add_boolean(const char* key, bool value)
        return 0;
 }
 
-int package_worker_report_add_string(const char* key, const char *value)
+int system_worker_report_add_string(const char* key, const char *value)
 {
        retv_if(!key, -1);
        retv_if(!report_h, -1);
@@ -149,14 +149,14 @@ int package_worker_report_add_string(const char* key, const char *value)
        return 0;
 }
 
-char *package_worker_report_get_json_string(void)
+char *system_worker_report_get_json_string(void)
 {
        JsonGenerator *gen = NULL;
        JsonNode *root = NULL;
        char *str = NULL;
 
        retv_if(!report_h->builder, NULL);
-       retv_if(!report_h->is_begin, NULL);
+       retv_if(report_h->is_begin, NULL);
        retv_if(!report_h->is_end, NULL);
 
        root = json_builder_get_root(report_h->builder);
@@ -180,10 +180,10 @@ static void __submit_completed_cb(ttd_worker_submit_result_e result, ttd_worker_
        if (handle->report_cb)
                handle->report_cb(result, handle->cb_data);
        else
-               package_worker_report_fini();
+               system_worker_report_fini();
 }
 
-int package_worker_report_submit_report(const char *report,
+int system_worker_report_submit_report(const char *report,
                report_completed_cb completed_cb, void *cb_data)
 {
        int ret = 0;