Change submit result to enum

Change-Id: Id169833b7cc363f6f4c47b6f3caf71914f24f67b

diff --git a/lib/things-service-worker/include/ttsd-worker-lib.h b/lib/things-service-worker/include/ttsd-worker-lib.h
index 0d4dba9..d67ff5c 100644 (file)
--- a/lib/things-service-worker/include/ttsd-worker-lib.h
+++ b/lib/things-service-worker/include/ttsd-worker-lib.h
@@ -19,7 +19,12 @@
 #ifndef __TTSD_WORKER_LIB_H__
 #define __TTSD_WORKER_LIB_H__
 
-typedef void(*ttsd_worker_submit_report_completed_cb)(const char *result, void *user_data);
+typedef enum {
+       TTSD_WORKER_SUBMIT_SUCCESS,
+       TTSD_WORKER_SUBMIT_FAIL,
+} ttsd_worker_submit_result_e;
+
+typedef void(*ttsd_worker_submit_report_completed_cb)(ttsd_worker_submit_result_e result, void *user_data);
 
 int ttsd_worker_submit_report(const char *report, ttsd_worker_submit_report_completed_cb completed_cb, void *completed_cb_data);
 int ttsd_worker_submit_report_sync(const char *report);

diff --git a/lib/things-service-worker/src/ttsd-worker-lib.c b/lib/things-service-worker/src/ttsd-worker-lib.c
index e683f85..879fdc6 100644 (file)
--- a/lib/things-service-worker/src/ttsd-worker-lib.c
+++ b/lib/things-service-worker/src/ttsd-worker-lib.c
@@ -44,6 +44,8 @@ static void __destroy_dbus_connection(dbus_h *h)
        }
        if (h->dbus_object)
                g_object_unref(h->dbus_object);
+       if (h)
+               g_free(h);
 }
 
 static dbus_h *__make_dbus_connection(void)
@@ -81,7 +83,7 @@ static void __submit_completed_cb(GObject *source_object, GAsyncResult *res, gpo
        dbus_h *h = user_data;
        gint ret_val = -1;
        gboolean ret = FALSE;
-       const char *result = NULL;
+       ttsd_worker_submit_result_e result;
 
        _D("Send completed");
 
@@ -93,14 +95,14 @@ static void __submit_completed_cb(GObject *source_object, GAsyncResult *res, gpo
        ret = ttsd_worker_dbus_call_ttsd_worker_submit_report_finish(h->dbus_object, &ret_val, res, &g_error);
        if (!ret) {
                _E("DBus proxy call is failed[%s]", g_error->message);
-               result = "Failed to submit report";
+               result = TTSD_WORKER_SUBMIT_FAIL;
                g_error_free(g_error);
        } else {
                if (ret_val < 0) {
                        _E("Submit report is failed");
-                       result = "Failed to submit report";
+                       result = TTSD_WORKER_SUBMIT_FAIL;
                } else
-                       result = "Success to submit report";
+                       result = TTSD_WORKER_SUBMIT_SUCCESS;
        }
 
        if (h->completed_cb)