code cleanup

Change-Id: Idc6fbd1cac8364c5b767a1f45c6ea39fa163fa76

diff --git a/inc/static_internal.h b/inc/static_internal.h
index 3ffb5ac894ed3522a57b2a934d97edd5ed6a6f75..77e5cdcfd6919947d196f56695b46e3ff5aa9b39 100755 (executable)
--- a/inc/static_internal.h
+++ b/inc/static_internal.h
@@ -25,6 +25,10 @@ int dbus_init();
 
 int register_dbus_interface(const char *bus_name, const char *bus_obj, const char *bus_if);
 
+#define SERVICE_ENABLER_NAME "org.example.TizenServiceEnabler"
+#define SERVICE_ENABLER_PATH "/org/example/TizenServiceEnabler"
+#define SERVICE_ENABLER_INTERFACE "org.example.TizenServiceEnabler"
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/tizen-service-enabler-common.c b/src/tizen-service-enabler-common.c
index d7f282055b96defe6667777c7d49de011f63ca84..191549ca75e5245f809b5c9d3c6a92605559ec1d 100755 (executable)
--- a/src/tizen-service-enabler-common.c
+++ b/src/tizen-service-enabler-common.c
@@ -12,6 +12,11 @@
                dlog_print(DLOG_INFO, LOG_TAG, "%s : %s(%d) > "fmt, rindex(__FILE__, '/')+1, __FUNCTION__, __LINE__,##__VA_ARGS__);\
        } while (0)
 
+#define ERROR_LOG(fmt, ...) do { \
+               dlog_print(DLOG_INFO, LOG_TAG, "%s : %s(%d) > "fmt, rindex(__FILE__, '/')+1, __FUNCTION__, __LINE__,##__VA_ARGS__);\
+       } while (0)
+
+
 
 #define DBUS_SERVICE_DBUS "org.freedesktop.DBus"
 #define DBUS_PATH_DBUS "/org/freedesktop/DBus"
@@ -40,7 +45,11 @@ int default_handler(int cmd_type, GVariant *input, GVariant **cmd_ret)
 
 GVariant* stub_send_command(GVariant *parameters)
 {
-       DEBUG_LOG("");
+       DEBUG_LOG("called");
+       if (!parameters) {
+               ERROR_LOG("NULL param");
+               return NULL;
+       }
 
        gint cmd_type;
        GVariant *val;
@@ -48,15 +57,19 @@ GVariant* stub_send_command(GVariant *parameters)
        GVariant *cmd_ret = NULL;
        int cmd_error = 0;
 
-//     sleep(1);
-
+       DEBUG_LOG("1");
        g_variant_get(parameters, "(iv)", &cmd_type, &val);
+       DEBUG_LOG("2");
 
        switch (cmd_type) {
                case 20: {
                        cmd_error = default_handler(cmd_type, val, &cmd_ret);
+                       break;
+               }
+               case 30: {
+                       cmd_error = default_handler(cmd_type, val, &cmd_ret);
+                       break;
                }
-
        }
 
        if (cmd_error != 0) {
@@ -71,7 +84,10 @@ GVariant* stub_send_command(GVariant *parameters)
 int proxy_send_command(const char *bus_name, const char *bus_obj, const char *bus_if,
                                int cmd_type, GVariant *cmd_param, GVariant **cmd_ret)
 {
-       DEBUG_LOG("2");
+       DEBUG_LOG("cmd[%d]", cmd_type);
+       if(!__gdbus_conn)
+               dbus_init();
+
        int ret = 0;
 
        GError *gerror = NULL;
@@ -142,6 +158,9 @@ int proxy_send_command_async(const char *bus_name, const char *bus_obj, const ch
                                int cmd_type, GVariant *data, proxy_cb user_cb, void* user_data)
 {
        DEBUG_LOG("async begin");
+       if(!__gdbus_conn)
+               dbus_init();
+
        int ret = 0;
 
        GCancellable *proxy_cancel = g_cancellable_new();
@@ -206,6 +225,7 @@ static const GDBusInterfaceVTable interface_vtable = {
 
 int dbus_init()
 {
+       if (__gdbus_conn) return 0;
        DEBUG_LOG("");
        int ret = -1;
        GError *error = NULL;

diff --git a/src/tizen-service-enabler-lib.c b/src/tizen-service-enabler-lib.c
index c07fb8bb0ef0a75e6af957358203d513ca284c60..bbbf612357964f9661133bf35fa1ac8ccb41ac4c 100755 (executable)
--- a/src/tizen-service-enabler-lib.c
+++ b/src/tizen-service-enabler-lib.c
@@ -48,7 +48,6 @@ hello(char *hi, char **echo)
        DEBUG_LOG("hello called");
        int ret = 0;
 
-       dbus_init();
        int cmd_type = 20;
        GVariant *param = g_variant_new("s", hi);
        GVariant *cmd_ret = NULL;
@@ -81,10 +80,9 @@ void _bye_wrapper_cb(int error, GVariant* ret, void* user_data)
 int
 bye(char *str, bye_cb user_cb, void* user_data)
 {
-       DEBUG_LOG("hello called");
+       DEBUG_LOG("bye called");
        int ret = 0;
 
-       dbus_init();
        int cmd_type = 30;
        GVariant *param = g_variant_new("s", str);
 
@@ -96,7 +94,7 @@ bye(char *str, bye_cb user_cb, void* user_data)
        _wrapper->_cb = user_cb;
        _wrapper->_data = user_data;
 
-       proxy_send_command_async(SERVICE_ENABLER_NAME, SERVICE_ENABLER_PATH, SERVICE_ENABLER_INTERFACE,
+       ret = proxy_send_command_async(SERVICE_ENABLER_NAME, SERVICE_ENABLER_PATH, SERVICE_ENABLER_INTERFACE,
                        cmd_type, param, _bye_wrapper_cb, (void*) _wrapper);
 
        return ret;