Modify function name & parameter

diff --git a/workers/system-info/src/controller.c b/workers/system-info/src/controller.c
index 7c30334..d1efe5f 100644 (file)
--- a/workers/system-info/src/controller.c
+++ b/workers/system-info/src/controller.c
@@ -36,19 +36,14 @@ static int __get_system_info(void *data);
 static int __get_system_info_int(char *key, FILE *file);
 static int __get_system_info_bool(char *key, FILE *file);
 static int __get_system_info_string(char *key, FILE *file);
-static int __initialize_file_logging(FILE *file);
-static void __finalize_file_logging(FILE *file);
+static int __initialize_file_logging(FILE **file);
+static void __finalize_file_logging(FILE **file);
 static char *__check_error_reason(int ret, char *reason);
 
 static bool service_app_create(void *data)
 {
        app_data *ad = data;
 
-       if (__get_system_info(ad) < 0) {
-               _E("Failed to get system information");
-               return false;
-       }
-
        return true;
 }
 
@@ -62,6 +57,12 @@ static void service_app_terminate(void *data)
 static void service_app_control(app_control_h app_control, void *data)
 {
     /* APP_CONTROL */
+       app_data *ad = data;
+
+       if (__get_system_info(ad) < 0) {
+               _E("Failed to get system information");
+       }
+
        service_app_exit();
 }
 
@@ -118,17 +119,13 @@ static int __get_system_info_int(char *key, FILE *file)
        ret = system_info_get_platform_int(key, &val);
        if (ret != SYSTEM_INFO_ERROR_NONE) {
                _E("Failed to get System Info [%s] -- [%s]", key, __check_error_reason(ret, reason));
-               goto ERROR;
+               return -1;
        } else {
                _D("[%s] : [%d]", key, val);
                fprintf(file, "[%s] : [%d]\n", key, val);
        }
 
        return 0;
-
-ERROR:
-       __finalize_file_logging(file);
-       return -1;
 }
 
 static int __get_system_info_bool(char *key, FILE *file)
@@ -140,17 +137,13 @@ static int __get_system_info_bool(char *key, FILE *file)
        ret = system_info_get_platform_bool(key, &val);
        if (ret != SYSTEM_INFO_ERROR_NONE) {
                _E("Failed to get System Info [%s] -- [%s]", key, __check_error_reason(ret, reason));
-               goto ERROR;
+               return -1;
        } else {
                _D("[%s] : [%s]", key, val ? "TRUE" : "FALSE");
                fprintf(file, "[%s] : [%s]\n", key, val ? "TRUE" : "FALSE");
        }
 
        return 0;
-
-ERROR:
-       __finalize_file_logging(file);
-       return -1;
 }
 
 static int __get_system_info_string(char *key, FILE *file)
@@ -162,7 +155,6 @@ static int __get_system_info_string(char *key, FILE *file)
        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, reason));
-               goto ERROR;
        } else {
                _D("[%s] : [%s]", key, val);
                fprintf(file, "[%s] : [%s]\n", key, val);
@@ -171,15 +163,11 @@ static int __get_system_info_string(char *key, FILE *file)
        free(val);
 
        return 0;
-
-ERROR:
-       __finalize_file_logging(file);
-       return -1;
 }
 
-static int __initialize_file_logging(FILE *file)
+static int __initialize_file_logging(FILE **file)
 {
-       if((file = fopen("/tmp/info.txt", "w+")) == NULL) {
+       if((*(file) = fopen("/tmp/info.txt", "w+")) == NULL) {
                _E("Failed to oepn log file");
                return -1;
        }
@@ -187,9 +175,9 @@ static int __initialize_file_logging(FILE *file)
        return 0;
 }
 
-static void __finalize_file_logging(FILE *file)
+static void __finalize_file_logging(FILE **file)
 {
-       fclose(file);
+       fclose(*(file));
 }
 
 static int __get_system_info(void *data)
@@ -199,7 +187,7 @@ static int __get_system_info(void *data)
        int ret = -1;
        app_data *ad = data;
 
-       if (__initialize_file_logging(ad->file) < 0)
+       if (__initialize_file_logging(&(ad->file)) < 0)
                return -1;
 
        for (i = 0; i < INFO_KEY_MAX && sys_info[i].key != NULL; i++) {
@@ -220,10 +208,10 @@ static int __get_system_info(void *data)
                }
 
                if (ret < 0)
-                       return -1;
+                       break;
        }
 
-       __finalize_file_logging(ad->file);
+       __finalize_file_logging(&(ad->file));
 
        return 0;
 }