unified the seperated error code into one

Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/capi/include/mdg.h b/capi/include/mdg.h
index 366d7e9..7390100 100644 (file)
--- a/capi/include/mdg.h
+++ b/capi/include/mdg.h
@@ -45,8 +45,8 @@ typedef void *mdg_h;
  *
  * @since_tizen 5.0
  */
-#ifndef TIZEN_ERROR_COMP
-#define TIZEN_ERROR_COMP -0x02F50000 /**< Base error code */
+#ifndef TIZEN_ERROR_MDG
+#define TIZEN_ERROR_MDG -0x02F50000 /**< Base error code */
 #endif
 
 /**
@@ -61,15 +61,19 @@ typedef enum {
        MDG_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */
        MDG_ERROR_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED, /**< Permission denied */
        MDG_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< Not supported */
-       MDG_ERROR_COMM_ERROR = TIZEN_ERROR_COMP | 0x01, /**< communication error */
-       MDG_ERROR_RX = TIZEN_ERROR_COMP | 0x02, /**< RX error */
-       MDG_ERROR_TX = TIZEN_ERROR_COMP | 0x03, /**< TX error */
-       MDG_ERROR_OPERATION_FAILED = TIZEN_ERROR_COMP | 0x04, /**< Operation Failed */
-       MDG_ERROR_ALREADY_IN_PROGRESS = TIZEN_ERROR_COMP | 0x05, /**< Operation now in progress */
-       MDG_ERROR_ALREADY_INITIALIZED = TIZEN_ERROR_COMP | 0x06, /**< Already initilized */
-       MDG_ERROR_NO_DATA = TIZEN_ERROR_COMP | 0x07, /**< No Data */
-       MDG_ERROR_NOT_STARTED = TIZEN_ERROR_COMP | 0x08, /**< Not Started */
+       MDG_ERROR_NO_DATA = TIZEN_ERROR_MDG | 0x01, /**< Data not exists */
+       MDG_ERROR_OPERATION_FAILED = TIZEN_ERROR_MDG | 0x02, /**< operation failed */
+       MDG_ERROR_ALREADY_REGISTERED = TIZEN_ERROR_MDG | 0x03, /**< Request already registered */
+       MDG_ERROR_IN_PROGRESS = TIZEN_ERROR_MDG | 0x04,/**< operation is in progress */
+       MDG_ERROR_COMM_ERROR = TIZEN_ERROR_MDG | 0x05, /**< communication error */
+       MDG_ERROR_RX = TIZEN_ERROR_MDG | 0x06, /**< RX error */
+       MDG_ERROR_TX = TIZEN_ERROR_MDG | 0x07, /**< TX error */
+       MDG_ERROR_PLUGIN_FAIL = TIZEN_ERROR_MDG | 0x08, /**< Plugin failed */
+       MDG_ERROR_ALREADY_IN_PROGRESS = TIZEN_ERROR_MDG | 0x09, /**< Already in progress */
+       MDG_ERROR_NOT_STARTED = TIZEN_ERROR_MDG | 0x0A, /**< Not Started */
+       MDG_ERROR_ALREADY_INITIALIZED = TIZEN_ERROR_MDG | 0x0B, /**< Already initilized */
        MDG_ERROR_UNKNOWN = -999,
+
 } mdg_error_e;
 
 /**

diff --git a/capi/src/mdg.c b/capi/src/mdg.c
index e78163a..ee51bee 100644 (file)
--- a/capi/src/mdg.c
+++ b/capi/src/mdg.c
@@ -372,7 +372,7 @@ EXPORT_API int mdg_device_get_found_devices(mdg_h handle,
        /* LCOV_EXCL_START */
        if (*count > 0) {
                GVariantIter *iter = NULL, *iter_row = NULL;
-               GVariant *key_value;
+               GVariant *key_value = NULL;
                const gchar *key;
                guint i = 0;
 

diff --git a/capi/src/mdg_dbus.c b/capi/src/mdg_dbus.c
index fe7b757..510374f 100644 (file)
--- a/capi/src/mdg_dbus.c
+++ b/capi/src/mdg_dbus.c
@@ -21,7 +21,6 @@
 #include <gio/gio.h>
 #include <stdlib.h>
 
-#include <dlog.h>
 #include <mdg.h>
 #include <mdg_util.h>
 #include <mdg_dbus.h>

diff --git a/capi/test/main.c b/capi/test/main.c
index d6d97a1..bb4bf44 100644 (file)
--- a/capi/test/main.c
+++ b/capi/test/main.c
@@ -51,17 +51,17 @@ const char* mdg_error_to_string(mdg_error_e err)
        CASE_TO_STR(MDG_ERROR_OUT_OF_MEMORY)
        CASE_TO_STR(MDG_ERROR_PERMISSION_DENIED)
        CASE_TO_STR(MDG_ERROR_NOT_SUPPORTED)
-       CASE_TO_STR(MDG_ERROR_COMM_ERROR)
+       CASE_TO_STR(MDG_ERROR_OPERATION_FAILED)
+       CASE_TO_STR(MDG_ERROR_ALREADY_REGISTERED)
+       CASE_TO_STR(MDG_ERROR_IN_PROGRESS)
        CASE_TO_STR(MDG_ERROR_RX)
        CASE_TO_STR(MDG_ERROR_TX)
-       CASE_TO_STR(MDG_ERROR_OPERATION_FAILED)
+       CASE_TO_STR(MDG_ERROR_PLUGIN_FAIL)
        CASE_TO_STR(MDG_ERROR_ALREADY_IN_PROGRESS)
-       CASE_TO_STR(MDG_ERROR_ALREADY_INITIALIZED)
-       CASE_TO_STR(MDG_ERROR_NO_DATA)
        CASE_TO_STR(MDG_ERROR_NOT_STARTED)
-       CASE_TO_STR(MDG_ERROR_UNKNOWN)
+       CASE_TO_STR(MDG_ERROR_ALREADY_INITIALIZED)
        default :
-               return "MDG_ERROR_GENERAL";
+               return "MDG_ERROR_UNKNOWN";
        }
 }
 

diff --git a/src/mdg-manager/include/mdgd_enum.h b/src/mdg-manager/include/mdgd_enum.h
index 2420a13..e733d59 100644 (file)
--- a/src/mdg-manager/include/mdgd_enum.h
+++ b/src/mdg-manager/include/mdgd_enum.h
@@ -22,7 +22,9 @@
 
 #define NOTUSED(var) (var = var) /**< It is used to avoid generating build warning */
 
-#define TIZEN_ERROR_COMP 0 /**< Same one */
+#ifndef TIZEN_ERROR_MDG
+#define TIZEN_ERROR_MDG -0x02F50000 /**< Base error code */
+#endif
 
 /**
  * @brief Error codes for mdg-manager.
@@ -36,13 +38,18 @@ typedef enum {
        MDGD_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */
        MDGD_ERROR_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED, /**< Permission denied */
        MDGD_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< Not supported */
-       MDGD_ERROR_COMM_ERROR = TIZEN_ERROR_COMP | 0x01, /**< communication error */
-       MDGD_ERROR_RX = TIZEN_ERROR_COMP | 0x02, /**< RX error */
-       MDGD_ERROR_TX = TIZEN_ERROR_COMP | 0x03, /**< TX error */
-       MDGD_ERROR_PLUGIN_FAIL = TIZEN_ERROR_COMP | 0x04, /**< Plugin failed */
-       MDGD_ERROR_OPERATION_FAILED = TIZEN_ERROR_COMP | 0x05, /**< Operation Failed */
-       MDGD_ERROR_ALREADY_IN_PROGRESS = TIZEN_ERROR_COMP | 0x06, /**< Already initilized */
-       MDGD_ERROR_UNKNOWN = -999,
+       MDGD_ERROR_NO_DATA = TIZEN_ERROR_MDG | 0x01, /**< Data not exists */
+       MDGD_ERROR_OPERATION_FAILED = TIZEN_ERROR_MDG | 0x02, /**< operation failed */
+       MDGD_ERROR_ALREADY_REGISTERED = TIZEN_ERROR_MDG | 0x03, /**< Request already registered */
+       MDGD_ERROR_IN_PROGRESS = TIZEN_ERROR_MDG | 0x04,/**< operation is in progress */
+       MDGD_ERROR_COMM_ERROR = TIZEN_ERROR_MDG | 0x05, /**< communication error */
+       MDGD_ERROR_RX = TIZEN_ERROR_MDG | 0x06, /**< RX error */
+       MDGD_ERROR_TX = TIZEN_ERROR_MDG | 0x07, /**< TX error */
+       MDGD_ERROR_PLUGIN_FAIL = TIZEN_ERROR_MDG | 0x08, /**< Plugin failed */
+       MDGD_ERROR_ALREADY_IN_PROGRESS = TIZEN_ERROR_MDG | 0x09, /**< Already in progress */
+       MDGD_ERROR_NOT_STARTED = TIZEN_ERROR_MDG | 0x0A, /**< Not Started */
+       MDGD_ERROR_ALREADY_INITIALIZED = TIZEN_ERROR_MDG | 0x0B, /**< Already initilized */
+       MDGD_ERROR_UNKNOWN = -999
 } mdgd_error_e;
 
 /**

diff --git a/src/mdg-manager/src/mdgd_log.c b/src/mdg-manager/src/mdgd_log.c
index 7f9d851..71c75d0 100644 (file)
--- a/src/mdg-manager/src/mdgd_log.c
+++ b/src/mdg-manager/src/mdgd_log.c
@@ -32,16 +32,26 @@ const char *mdgd_log_get_error_string(int result)
                return "MDGD_ERROR_PERMISSION_DENIED";
        case MDGD_ERROR_NOT_SUPPORTED:
                return "MDGD_ERROR_NOT_SUPPORTED";
+       case MDGD_ERROR_NO_DATA:
+               return "MDGD_ERROR_NO_DATA";
+       case MDGD_ERROR_OPERATION_FAILED:
+               return "MDGD_ERROR_OPERATION_FAILED";
+       case MDGD_ERROR_ALREADY_REGISTERED:
+               return "MDGD_ERROR_ALREADY_REGISTERED";
+       case MDGD_ERROR_IN_PROGRESS:
+               return "MDGD_ERROR_IN_PROGRESS";
        case MDGD_ERROR_COMM_ERROR:
                return "MDGD_ERROR_COMM_ERROR";
        case MDGD_ERROR_RX:
                return "MDGD_ERROR_RX";
        case MDGD_ERROR_TX:
-               return "MDGD_ERROR_RX";
+               return "MDGD_ERROR_TX";
        case MDGD_ERROR_PLUGIN_FAIL:
                return "MDGD_ERROR_PLUGIN_FAIL";
-       case MDGD_ERROR_OPERATION_FAILED:
-               return "MDGD_ERROR_OPERATION_FAILED";
+       case MDGD_ERROR_ALREADY_IN_PROGRESS:
+               return "MDGD_ERROR_ALREADY_IN_PROGRESS";
+       case MDGD_ERROR_ALREADY_INITIALIZED:
+               return "MDG_ERROR_ALREADY_INITIALIZED";
        default:
                return "UNKNOWN";
        }

diff --git a/src/mot-agent/CMakeLists.txt b/src/mot-agent/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/mot-agent/ma.h b/src/mot-agent/ma.h
index 7d5cdb9..9ab7227 100644 (file)
--- a/src/mot-agent/ma.h
+++ b/src/mot-agent/ma.h
@@ -21,16 +21,30 @@
 #include <gio/gio.h>
 #include <tizen.h>
 
+#ifndef TIZEN_ERROR_MDG
+#define TIZEN_ERROR_MDG -0x02F50000 /**< Base error code */
+#endif
+
 /**< Internal error code with d2ds daemon. It should be matched with API side */
 typedef enum {
-       MA_ERROR_NONE = 0, /**< Successful */
-       MA_ERROR_IO_ERROR, /**< I/O error */
-       MA_ERROR_NO_DATA, /**< Data not exists */
-       MA_ERROR_OUT_OF_MEMORY, /**< out of memory */
-       MA_ERROR_OPERATION_FAILED, /**< operation failed */
-       MA_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
-       MA_ERROR_ALREADY_REGISTERED, /**< Request already registered */
-       MA_ERROR_IN_PROGRESS /**< operation is in progress */
+       MA_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */
+       MA_ERROR_IO_ERROR = TIZEN_ERROR_IO_ERROR, /**< I/O error */
+       MA_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
+       MA_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */
+       MA_ERROR_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED, /**< Permission denied */
+       MA_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< Not supported */
+       MA_ERROR_NO_DATA = TIZEN_ERROR_MDG | 0x01, /**< Data not exists */
+       MA_ERROR_OPERATION_FAILED = TIZEN_ERROR_MDG | 0x02, /**< operation failed */
+       MA_ERROR_ALREADY_REGISTERED = TIZEN_ERROR_MDG | 0x03, /**< Request already registered */
+       MA_ERROR_IN_PROGRESS = TIZEN_ERROR_MDG | 0x04,/**< operation is in progress */
+       MA_ERROR_COMM_ERROR = TIZEN_ERROR_MDG | 0x05, /**< communication error */
+       MA_ERROR_RX = TIZEN_ERROR_MDG | 0x06, /**< RX error */
+       MA_ERROR_TX = TIZEN_ERROR_MDG | 0x07, /**< TX error */
+       MA_ERROR_PLUGIN_FAIL = TIZEN_ERROR_MDG | 0x08, /**< Plugin failed */
+       MA_ERROR_ALREADY_IN_PROGRESS = TIZEN_ERROR_MDG | 0x09, /**< Already in progress */
+       MA_ERROR_NOT_STARTED = TIZEN_ERROR_MDG | 0x0A, /**< Not Started */
+       MA_ERROR_ALREADY_INITIALIZED = TIZEN_ERROR_MDG | 0x0B, /**< Already initilized */
+       MA_ERROR_UNKNOWN = -999,
 } ma_error_e;
 
 /**< d2d-subowner service structure */