move command handling functions to cmd func module

Change-Id: I098b4b65701416b011e01d8825c308d328fe7dea

diff --git a/daemon/include/ttd-cmd-type.h b/daemon/include/ttd-cmd-type.h
index 39c0c4e..ce7c61b 100644 (file)
--- a/daemon/include/ttd-cmd-type.h
+++ b/daemon/include/ttd-cmd-type.h
@@ -86,9 +86,9 @@ typedef enum {
        TTD_CMD_RESULT_FAIL,
 } ttd_cmd_result_e;
 
-typedef void (*cmd_data_free_func)(void *data);
-typedef int (*ttd_cmd_launch_func)(void *cmd_data);
-
 typedef struct _ttd_cmd_data_s ttd_cmd_data;
 
+typedef void (*cmd_data_free_func)(void *data);
+typedef int (*ttd_cmd_launch_func)(ttd_cmd_data *cmd_data);
+
 #endif /* __TTD_CMD_TYPE_H__ */

diff --git a/daemon/include/ttd-worker-handle.h b/daemon/include/ttd-worker-handle.h
index 7bc71b1..1d75b37 100644 (file)
--- a/daemon/include/ttd-worker-handle.h
+++ b/daemon/include/ttd-worker-handle.h
@@ -17,6 +17,9 @@
 #ifndef __TT_DAEMON_WORKER_HANDLE_H__
 #define __TT_DAEMON_WORKER_HANDLE_H__
 
-int ttd_worker_launch(void *cmd_data);
+#include "ttd-cmd-type.h"
+
+int ttd_worker_handle_pkgmgr(ttd_cmd_data *c_data);
+int ttd_worker_handle_info(ttd_cmd_data *c_data);
 
 #endif /* __TT_DAEMON_WORKER_HANDLE_H__ */

diff --git a/daemon/src/ttd-cmd-func.c b/daemon/src/ttd-cmd-func.c
index f86f806..e5c75d9 100644 (file)
--- a/daemon/src/ttd-cmd-func.c
+++ b/daemon/src/ttd-cmd-func.c
@@ -15,10 +15,67 @@
  */
 
 #include <glib.h>
-#include "ttd-cmd-type.h"
+#include "ttd-log.h"
+#include "ttd-cmd.h"
 #include "ttd-config.h"
 #include "ttd-worker-handle.h"
 
+static int __config_write(ttd_cmd_data *c_data)
+{
+       void *data = NULL;
+       unsigned int data_len = 0;
+       int ret = 0;
+
+       retv_if(!c_data, -1);
+
+       ret = ttd_cmd_get_data(c_data, &data, &data_len);
+       retv_if(ret < 0, -1);
+
+       switch (ttd_cmd_get_command(c_data))
+       {
+       case TTD_CMD_CONFIG_SET_SERVER_URL:
+               ret = ttd_config_write_string("url", "server", (char *)data);
+               if (ret < 0) {
+                       _E("Failed to set server url[%s]", (char *)data);
+                       return -1;
+               }
+               break;
+       case TTD_CMD_CONFIG_SET_APP_ID:
+               ret = ttd_config_write_string("worker", "appid", (char *)data);
+               if (ret < 0) {
+                       _E("Failed to set app id[%s]", (char *)data);
+                       return -1;
+               }
+               break;
+       default:
+               _E("Strange action");
+               return -1;
+               break;
+       }
+
+       return 0;
+}
+
+static int __worker_launch(ttd_cmd_data *c_data)
+{
+       int ret = 0;
+       ttd_cmd_type_e cmd_type = TTD_CMD_TYPE_UNKNOWN;
+
+       retv_if(!c_data, -1);
+
+       cmd_type = ttd_cmd_get_type(c_data);
+
+       if (cmd_type == TTD_CMD_TYPE_PACKAGE) {
+               ret = ttd_worker_handle_pkgmgr(c_data);
+       } else if (cmd_type == TTD_CMD_TYPE_INFO) {
+               ret = ttd_worker_handle_info(c_data);
+       } else {
+               _E("not supported cmd type - %d", cmd_type);
+               ret = -1;
+       }
+       return ret;
+}
+
 ttd_cmd_launch_func ttd_cmd_get_launch_func(ttd_cmd_type_e type)
 {
        ttd_cmd_launch_func func = NULL;
@@ -27,11 +84,11 @@ ttd_cmd_launch_func ttd_cmd_get_launch_func(ttd_cmd_type_e type)
        case TTD_CMD_TYPE_POWER:
                break;
        case TTD_CMD_TYPE_CONFIG:
-               func = ttd_config_write;
+               func = __config_write;
                break;
        case TTD_CMD_TYPE_PACKAGE:
        case TTD_CMD_TYPE_INFO:
-               func = ttd_worker_launch;
+               func = __worker_launch;
                break;
        case TTD_CMD_TYPE_DIAGNOSIS:
                break;

diff --git a/daemon/src/ttd-config.c b/daemon/src/ttd-config.c
index 0ba9dc3..251d944 100644 (file)
--- a/daemon/src/ttd-config.c
+++ b/daemon/src/ttd-config.c
@@ -235,91 +235,3 @@ int ttd_config_remove_key(const char *group, const char *key)
 
        return 0;
 }
-
-int ttd_config_write(void *cmd_data)
-{
-       ttd_cmd_data *c_data = cmd_data;
-       void *data = NULL;
-       unsigned int data_len = 0;
-       int ret = 0;
-
-       retv_if(!cmd_data, -1);
-
-       ret = ttd_cmd_get_data(c_data, &data, &data_len);
-       retv_if(ret < 0, -1);
-
-       switch (ttd_cmd_get_command(cmd_data))
-       {
-       case TTD_CMD_CONFIG_SET_SERVER_URL:
-               ret = ttd_config_write_string("url", "server", (char *)data);
-               if (ret < 0) {
-                       _E("Failed to set server url[%s]", (char *)data);
-                       return -1;
-               }
-               break;
-       case TTD_CMD_CONFIG_SET_APP_ID:
-               ret = ttd_config_write_string("worker", "appid", (char *)data);
-               if (ret < 0) {
-                       _E("Failed to set app id[%s]", (char *)data);
-                       return -1;
-               }
-               break;
-#if 0
-       case TTD_CMD_CONFIG_SET_XXXX_XXXX:
-               int val = __convert_string_to_int((char *)c_data->data);
-               ret = ttd_config_write_integer("", "", val);
-               if (ret < 0) {
-                       _E("Failed to set XXX XXX[%d]", val);
-                       return -1;
-               }
-               break;
-       case TTD_CMD_CONFIG_SET_XXXX_XXX:
-               bool val = __convert_string_to_bool((char *)c_data->data);
-               ret = ttd_config_write_boolean("", "", val);
-               if (ret < 0) {
-                       _E("Failed to set XXX XXX[%d]", val);
-                       return -1;
-               }
-               break;
-#endif
-       default:
-               _E("Strange action");
-               return -1;
-               break;
-       }
-
-       return 0;
-}
-
-#if 0
-static int __convert_string_to_int(const char *str);
-static bool __convert_string_to_bool(const char *str);
-
-static int __convert_string_to_int(const char *str)
-{
-       if (!str) {
-               _E("String is NULL!!!!!!!");
-               return -1;
-       }
-
-       return atoi(str);
-}
-
-static bool __convert_string_to_bool(const char *str)
-{
-       if (!str) {
-               _E("String is NULL!!!!!!!");
-               return false;
-       }
-
-       if ((!strncmp(str, "false", strlen("false"))) || (!strncmp(str, "FALSE", strlen("FALSE"))))
-               return false;
-       else if ((!strncmp(str, "true", strlen("true")))
-                       || (!strncmp(str, "TRUE", strlen("TRUE"))))
-               return true;
-       else {
-               _E("Strange data!!!!!!");
-               return false;
-       }
-}
-#endif

diff --git a/daemon/src/ttd-worker-handle.c b/daemon/src/ttd-worker-handle.c
index 8ad2c3f..a6a71c0 100644 (file)
--- a/daemon/src/ttd-worker-handle.c
+++ b/daemon/src/ttd-worker-handle.c
@@ -20,10 +20,10 @@
 #include "ttd-log.h"
 
 #define WORKER_PKG_MGR "org.tizen.package-manager-worker"
-#define WORKER_INFO_SYS "ttsd-worker-system"
+#define WORKER_INFO_SYS "ttd-worker-system"
 #define WORKER_INFO_TASK "org.tizen.task-worker"
 
-int __worker_launch_info(ttd_cmd_data *c_data)
+int ttd_worker_handle_info(ttd_cmd_data *c_data)
 {
        app_control_h ac_h = NULL;
        int ac_ret = APP_CONTROL_ERROR_NONE;
@@ -70,7 +70,7 @@ FREE_N_RETURN:
        return ret;
 }
 
-int __worker_launch_pkgmgr(ttd_cmd_data *c_data)
+int ttd_worker_handle_pkgmgr(ttd_cmd_data *c_data)
 {
        app_control_h ac_h = NULL;
        int ac_ret = APP_CONTROL_ERROR_NONE;
@@ -132,24 +132,3 @@ FREE_N_RETURN:
 
        return ret;
 }
-
-int ttd_worker_launch(void *cmd_data)
-{
-       ttd_cmd_data *c_data = cmd_data;
-       int ret = 0;
-       ttd_cmd_type_e cmd_type = TTD_CMD_TYPE_UNKNOWN;
-
-       retv_if(!cmd_data, -1);
-
-       cmd_type = ttd_cmd_get_type(c_data);
-
-       if (cmd_type == TTD_CMD_TYPE_PACKAGE) {
-               ret = __worker_launch_pkgmgr(c_data);
-       } else if (cmd_type == TTD_CMD_TYPE_INFO) {
-               ret = __worker_launch_info(c_data);
-       } else {
-               _E("not supported cmd type - %d", cmd_type);
-               ret = -1;
-       }
-       return ret;
-}