Trivial modification : error rotines, change the name of header and a function parameter

Change-Id: I5f600552d03050b0a91c52f52c933b5add8bc3a7

diff --git a/src/controller.c b/src/controller.c
index c52ab48..177ac3f 100644 (file)
--- a/src/controller.c
+++ b/src/controller.c
@@ -20,7 +20,7 @@
 #include <system_info.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <ttsd-worker-lib.h>
+#include <ttd-worker-lib.h>
 
 #include "log.h"
 #include "controller.h"
@@ -30,16 +30,13 @@
 #define COMMAND_ID "id"
 #define SUBMIT_SYNC 0
 
-typedef struct app_data_s {
-} app_data;
-
 static int __get_requested_system_info(const char *key);
 static int __get_all_system_info(void);
 static int __get_system_info_int(const char *key);
 static int __get_system_info_bool(const char *key);
 static int __get_system_info_string(const char *key);
 static const char *__check_error_reason(int err_code);
-static void __submit_report_completed_cb(const char *result, void *user_data);
+static void __submit_report_completed_cb(ttd_worker_submit_result_e result, void *user_data);
 
 static bool service_app_create(void *data)
 {
@@ -53,12 +50,8 @@ static bool service_app_create(void *data)
 
 static void service_app_terminate(void *data)
 {
-       app_data *ad = data;
-
        if (json_util_fini() < 0)
                _E("Failed to finalize Json Object");
-
-       free(ad);
 }
 
 static void service_app_control(app_control_h app_control, void *data)
@@ -124,7 +117,7 @@ DONE:
                free(report);
                service_app_exit();
 #else
-               ret = ttsd_worker_submit_report(report, __submit_report_completed_cb, NULL);
+               ret = ttd_worker_submit_report(report, TTD_WORKER_COMPLETED, __submit_report_completed_cb, NULL);
                free(report);
 
                if (ret < 0) {
@@ -136,46 +129,16 @@ DONE:
                service_app_exit();
 }
 
-static void service_app_lang_changed(app_event_info_h event_info, void *user_data)
-{
-       /*APP_EVENT_LANGUAGE_CHANGED*/
-}
-
-static void service_app_region_changed(app_event_info_h event_info, void *user_data)
-{
-       /*APP_EVENT_REGION_FORMAT_CHANGED*/
-}
-
-static void service_app_low_battery(app_event_info_h event_info, void *user_data)
-{
-       /*APP_EVENT_LOW_BATTERY*/
-}
-
-static void service_app_low_memory(app_event_info_h event_info, void *user_data)
-{
-       /*APP_EVENT_LOW_MEMORY*/
-}
-
 int main(int argc, char* argv[])
 {
-       app_data *ad = NULL;
        int ret = 0;
        service_app_lifecycle_callback_s event_callback;
-       app_event_handler_h handlers[5] = {NULL, };
-
-       ad = calloc(1, sizeof(app_data));
-       retv_if(!ad, -1);
 
        event_callback.create = service_app_create;
        event_callback.terminate = service_app_terminate;
        event_callback.app_control = service_app_control;
 
-       service_app_add_event_handler(&handlers[APP_EVENT_LOW_BATTERY], APP_EVENT_LOW_BATTERY, service_app_low_battery, &ad);
-       service_app_add_event_handler(&handlers[APP_EVENT_LOW_MEMORY], APP_EVENT_LOW_MEMORY, service_app_low_memory, &ad);
-       service_app_add_event_handler(&handlers[APP_EVENT_LANGUAGE_CHANGED], APP_EVENT_LANGUAGE_CHANGED, service_app_lang_changed, &ad);
-       service_app_add_event_handler(&handlers[APP_EVENT_REGION_FORMAT_CHANGED], APP_EVENT_REGION_FORMAT_CHANGED, service_app_region_changed, &ad);
-
-       ret = service_app_main(argc, argv, &event_callback, ad);
+       ret = service_app_main(argc, argv, &event_callback, NULL);
 
        return ret;
 }
@@ -226,10 +189,11 @@ 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));
+               return -1;
        }
        _D("%s : %s", key, val);
 
-       ret = json_util_add_boolean(key, val);
+       ret = json_util_add_string(key, val);
 
        free(val);
 
@@ -325,11 +289,11 @@ static int __get_all_system_info(void)
        return ret;
 }
 
-static void __submit_report_completed_cb(const char *result, void *user_data)
+static void __submit_report_completed_cb(ttd_worker_submit_result_e result, void *user_data)
 {
        char *pre_report = user_data;
 
-       _D("Submit result[%s]", result);
+       _D("Submit result[%d]", result);
 
        free(pre_report);