Modify terms related to signal

Change-Id: I2b8a60163fe1a22ee077378c58429e2825974697
Signed-off-by: youngman <yman.jung@samsung.com>

diff --git a/daemon/icd-dbus.c b/daemon/icd-dbus.c
index 6e12b2e..a5f43ae 100644 (file)
--- a/daemon/icd-dbus.c
+++ b/daemon/icd-dbus.c
@@ -39,7 +39,7 @@ typedef struct _icd_dbus_client_s {
 
 typedef struct _icd_resource_handle {
        OCResourceHandle handle;
-       unsigned int number;
+       unsigned int signal_number;
 } icd_resource_handle_s;
 
 
@@ -71,7 +71,7 @@ static void _icd_dbus_resource_handle_free(OCResourceHandle handle)
 
                        if (rsrc_handle->handle == handle) {
                                DBG("resource handle(%u, %u) removed from handle list", handle,
-                                               rsrc_handle->number);
+                                               rsrc_handle->signal_number);
                                client->hdlist = g_list_delete_link(client->hdlist, cur_hd);
                                free(rsrc_handle);
                                g_mutex_unlock(&icd_dbus_client_list_mutex);
@@ -87,15 +87,15 @@ static void _icd_dbus_resource_handle_free(OCResourceHandle handle)
        return;
 }
 
-int icd_dbus_client_list_get_info(OCResourceHandle handle, unsigned int *sig_num,
-               gchar **bus_name)
+int icd_dbus_client_list_get_info(OCResourceHandle handle,
+               unsigned int *signal_number, gchar **bus_name)
 {
        FN_CALL;
        icd_dbus_client_s *client;
        GList *cur_client, *cur_hd;
        icd_resource_handle_s *rsrc_handle;
 
-       RETV_IF(NULL == sig_num, IOTCON_ERROR_INVALID_PARAMETER);
+       RETV_IF(NULL == signal_number, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == bus_name, IOTCON_ERROR_INVALID_PARAMETER);
 
        g_mutex_lock(&icd_dbus_client_list_mutex);
@@ -114,8 +114,8 @@ int icd_dbus_client_list_get_info(OCResourceHandle handle, unsigned int *sig_num
 
                        if (rsrc_handle->handle == handle) {
                                DBG("signal_number(%u) for resource handle(%u) found",
-                                               rsrc_handle->number, handle);
-                               *sig_num = rsrc_handle->number;
+                                               rsrc_handle->signal_number, handle);
+                               *signal_number = rsrc_handle->signal_number;
                                *bus_name = ic_utils_strdup(client->bus_name);
                                g_mutex_unlock(&icd_dbus_client_list_mutex);
                                return IOTCON_ERROR_NONE;
@@ -172,7 +172,7 @@ static void _icd_dbus_cleanup_handle(OCResourceHandle data)
        RET_IF(NULL == rsrc_handle);
        RET_IF(NULL == rsrc_handle->handle);
 
-       DBG("handle(%u, %u) deregistering", rsrc_handle->handle, rsrc_handle->number);
+       DBG("handle(%u, %u) deregistering", rsrc_handle->handle, rsrc_handle->signal_number);
 
        ret = icd_ioty_unregister_resource(rsrc_handle->handle);
        if (IOTCON_ERROR_NONE != ret)
@@ -325,7 +325,7 @@ static int _icd_dbus_resource_list_append_handle(const gchar *bus_name,
 
                        if (rsrc_handle->handle == handle) {
                                ERR("resource handle(%u, %u) already exist", rsrc_handle->handle,
-                                               rsrc_handle->number);
+                                               rsrc_handle->signal_number);
                                g_mutex_unlock(&icd_dbus_client_list_mutex);
                                return IOTCON_ERROR_ALREADY;
                        }
@@ -364,7 +364,7 @@ static int _icd_dbus_resource_list_append_handle(const gchar *bus_name,
        }
 
        rsrc_handle->handle = handle;
-       rsrc_handle->number = signal_number;
+       rsrc_handle->signal_number = signal_number;
 
        DBG("handle(%u) added in the client(%s, %u)", handle, bus_name, signal_number);
 
@@ -466,7 +466,8 @@ static gboolean _dbus_handle_bind_resource(icDbus *object,
 {
        int ret;
 
-       ret = icd_ioty_bind_resource(ICD_INT64_TO_POINTER(parent), ICD_INT64_TO_POINTER(child));
+       ret = icd_ioty_bind_resource(ICD_INT64_TO_POINTER(parent),
+                       ICD_INT64_TO_POINTER(child));
        if (IOTCON_ERROR_NONE != ret)
                ERR("icd_ioty_bind_resource() Fail(%d)", ret);
 

diff --git a/daemon/icd-dbus.h b/daemon/icd-dbus.h
index a647bb8..3088fac 100644 (file)
--- a/daemon/icd-dbus.h
+++ b/daemon/icd-dbus.h
@@ -24,8 +24,10 @@
 #define ICD_POINTER_TO_INT64(p) ((int64_t)(intptr_t)(p))
 
 icDbus* icd_dbus_get_object();
-int icd_dbus_client_list_get_info(void *handle, unsigned int *sig_num, gchar **bus_name);
-int icd_dbus_emit_signal(const char *dest, const char *sig_name, GVariant *value);
+int icd_dbus_client_list_get_info(void *handle, unsigned int *signal_number,
+               gchar **bus_name);
+int icd_dbus_emit_signal(const char *dest, const char *signal_name,
+               GVariant *value);
 unsigned int icd_dbus_init();
 void icd_dbus_deinit(unsigned int id);
 

diff --git a/daemon/icd-ioty-ocprocess.c b/daemon/icd-ioty-ocprocess.c
index 1ee728d..1d19907 100644 (file)
--- a/daemon/icd-ioty-ocprocess.c
+++ b/daemon/icd-ioty-ocprocess.c
@@ -43,7 +43,7 @@ struct icd_ioty_worker
 
 
 struct icd_req_context {
-       unsigned int signum;
+       unsigned int signal_number;
        char *bus_name;
        int types;
        int observer_id;
@@ -58,7 +58,7 @@ struct icd_req_context {
 
 
 struct icd_find_context {
-       unsigned int signum;
+       unsigned int signal_number;
        char *bus_name;
        int conn_type;
        GVariant **payload;
@@ -75,7 +75,7 @@ struct icd_crud_context {
 
 
 struct icd_info_context {
-       unsigned int signum;
+       unsigned int signal_number;
        int info_type;
        char *bus_name;
        GVariant *payload;
@@ -90,7 +90,7 @@ struct icd_tizen_info_context {
 
 
 struct icd_observe_context {
-       unsigned int signum;
+       unsigned int signal_number;
        int res;
        int seqnum;
        char *bus_name;
@@ -100,7 +100,7 @@ struct icd_observe_context {
 
 
 struct icd_presence_context {
-       unsigned int signum;
+       unsigned int signal_number;
        char *bus_name;
        int result;
        unsigned int nonce;
@@ -173,19 +173,19 @@ static int _ocprocess_worker_start(_ocprocess_cb cb, void *ctx)
 }
 
 
-static int _ocprocess_response_signal(const char *dest, const char *signal,
-               unsigned int signum, GVariant *value)
+static int _ocprocess_response_signal(const char *dest, const char *signal_prefix,
+               unsigned int signal_number, GVariant *value)
 {
        int ret;
-       char sig_name[IC_DBUS_SIGNAL_LENGTH] = {0};
+       char signal_name[IC_DBUS_SIGNAL_LENGTH] = {0};
 
-       ret = snprintf(sig_name, sizeof(sig_name), "%s_%u", signal, signum);
-       if (ret <= 0 || sizeof(sig_name) <= ret) {
+       ret = snprintf(signal_name, sizeof(signal_name), "%s_%u", signal_prefix, signal_number);
+       if (ret <= 0 || sizeof(signal_name) <= ret) {
                ERR("snprintf() Fail(%d)", ret);
                return IOTCON_ERROR_IO_ERROR;
        }
 
-       ret = icd_dbus_emit_signal(dest, sig_name, value);
+       ret = icd_dbus_emit_signal(dest, signal_name, value);
        if (IOTCON_ERROR_NONE != ret) {
                ERR("icd_dbus_emit_signal() Fail(%d)", ret);
                return ret;
@@ -264,7 +264,7 @@ static int _worker_req_handler(void *context)
                        ICD_POINTER_TO_INT64(ctx->resource_h));
 
        ret = _ocprocess_response_signal(ctx->bus_name, IC_DBUS_SIGNAL_REQUEST_HANDLER,
-                       ctx->signum, value);
+                       ctx->signal_number, value);
        if (IOTCON_ERROR_NONE != ret)
                ERR("_ocprocess_response_signal() Fail(%d)", ret);
 
@@ -310,7 +310,7 @@ OCEntityHandlerResult icd_ioty_ocprocess_req_handler(OCEntityHandlerFlag flag,
        }
 
        /* signal number & bus_name */
-       req_ctx->signum = signal_number;
+       req_ctx->signal_number = signal_number;
        req_ctx->bus_name = bus_name;
 
        dev_addr = calloc(1, sizeof(OCDevAddr));
@@ -431,7 +431,7 @@ static int _worker_find_cb(void *context)
                 * To reduce the number of emit_signal, let's send signal only one time for one device.
                 * for ex, client list. */
                ret = _ocprocess_response_signal(ctx->bus_name, IC_DBUS_SIGNAL_FOUND_RESOURCE,
-                               ctx->signum, value);
+                               ctx->signal_number, value);
                if (IOTCON_ERROR_NONE != ret) {
                        ERR("_ocprocess_response_signal() Fail(%d)", ret);
                        g_variant_unref(value);
@@ -468,7 +468,7 @@ OCStackApplicationResult icd_ioty_ocprocess_find_cb(void *ctx, OCDoHandle handle
                return OC_STACK_KEEP_TRANSACTION;
        }
 
-       find_ctx->signum = sig_context->signum;
+       find_ctx->signal_number = sig_context->signal_number;
        find_ctx->bus_name = ic_utils_strdup(sig_context->bus_name);
        find_ctx->payload = icd_payload_res_to_gvariant(resp->payload, &resp->devAddr);
        find_ctx->conn_type = icd_ioty_transport_flag_to_conn_type(resp->devAddr.adapter,
@@ -514,17 +514,18 @@ static int _worker_crud_cb(void *context)
 static int _worker_info_cb(void *context)
 {
        int ret;
-       const char *sig_name = NULL;
+       const char *signal_prefix = NULL;
        struct icd_info_context *ctx = context;
 
        RETV_IF(NULL == ctx, IOTCON_ERROR_INVALID_PARAMETER);
 
        if (ICD_DEVICE_INFO == ctx->info_type)
-               sig_name = IC_DBUS_SIGNAL_DEVICE;
+               signal_prefix = IC_DBUS_SIGNAL_DEVICE;
        else if (ICD_PLATFORM_INFO == ctx->info_type)
-               sig_name = IC_DBUS_SIGNAL_PLATFORM;
+               signal_prefix = IC_DBUS_SIGNAL_PLATFORM;
 
-       ret = _ocprocess_response_signal(ctx->bus_name, sig_name, ctx->signum, ctx->payload);
+       ret = _ocprocess_response_signal(ctx->bus_name, signal_prefix, ctx->signal_number,
+                       ctx->payload);
        if (IOTCON_ERROR_NONE != ret)
                ERR("_ocprocess_response_signal() Fail(%d)", ret);
 
@@ -733,8 +734,8 @@ static int _worker_observe_cb(void *context)
        value = g_variant_new("(a(qs)vii)", ctx->options, ctx->payload, ctx->res,
                        ctx->seqnum);
 
-       ret = _ocprocess_response_signal(ctx->bus_name, IC_DBUS_SIGNAL_OBSERVE, ctx->signum,
-                       value);
+       ret = _ocprocess_response_signal(ctx->bus_name, IC_DBUS_SIGNAL_OBSERVE,
+                       ctx->signal_number, value);
        if (IOTCON_ERROR_NONE != ret)
                ERR("_ocprocess_response_signal() Fail(%d)", ret);
 
@@ -747,7 +748,8 @@ static int _worker_observe_cb(void *context)
 }
 
 
-static void _observe_cb_response_error(const char *dest, unsigned int signum, int ret_val)
+static void _observe_cb_response_error(const char *dest,
+               unsigned int signal_number, int ret_val)
 {
        int ret;
        GVariant *value;
@@ -759,14 +761,14 @@ static void _observe_cb_response_error(const char *dest, unsigned int signum, in
 
        value = g_variant_new("(a(qs)vii)", &options, payload, ret_val, 0);
 
-       ret = _ocprocess_response_signal(dest, IC_DBUS_SIGNAL_OBSERVE, signum, value);
+       ret = _ocprocess_response_signal(dest, IC_DBUS_SIGNAL_OBSERVE, signal_number, value);
        if (IOTCON_ERROR_NONE != ret)
                ERR("_ocprocess_response_signal() Fail(%d)", ret);
 }
 
 
-OCStackApplicationResult icd_ioty_ocprocess_observe_cb(void *ctx, OCDoHandle handle,
-               OCClientResponse *resp)
+OCStackApplicationResult icd_ioty_ocprocess_observe_cb(void *ctx,
+               OCDoHandle handle, OCClientResponse *resp)
 {
        int ret, res;
        GVariantBuilder *options;
@@ -777,7 +779,7 @@ OCStackApplicationResult icd_ioty_ocprocess_observe_cb(void *ctx, OCDoHandle han
 
        if (NULL == resp->payload) {
                ERR("payload is empty");
-               _observe_cb_response_error(sig_context->bus_name, sig_context->signum,
+               _observe_cb_response_error(sig_context->bus_name, sig_context->signal_number,
                                IOTCON_ERROR_IOTIVITY);
                return OC_STACK_KEEP_TRANSACTION;
        }
@@ -785,7 +787,7 @@ OCStackApplicationResult icd_ioty_ocprocess_observe_cb(void *ctx, OCDoHandle han
        observe_ctx = calloc(1, sizeof(struct icd_observe_context));
        if (NULL == observe_ctx) {
                ERR("calloc() Fail(%d)", errno);
-               _observe_cb_response_error(sig_context->bus_name, sig_context->signum,
+               _observe_cb_response_error(sig_context->bus_name, sig_context->signal_number,
                                IOTCON_ERROR_OUT_OF_MEMORY);
                return OC_STACK_KEEP_TRANSACTION;
        }
@@ -796,7 +798,7 @@ OCStackApplicationResult icd_ioty_ocprocess_observe_cb(void *ctx, OCDoHandle han
                        resp->numRcvdVendorSpecificHeaderOptions);
 
        observe_ctx->payload = icd_payload_to_gvariant(resp->payload);
-       observe_ctx->signum = sig_context->signum;
+       observe_ctx->signal_number = sig_context->signal_number;
        observe_ctx->res = res;
        observe_ctx->bus_name = ic_utils_strdup(sig_context->bus_name);
        observe_ctx->options = options;
@@ -804,7 +806,7 @@ OCStackApplicationResult icd_ioty_ocprocess_observe_cb(void *ctx, OCDoHandle han
        ret = _ocprocess_worker_start(_worker_observe_cb, observe_ctx);
        if (IOTCON_ERROR_NONE != ret) {
                ERR("_ocprocess_worker_start() Fail(%d)", ret);
-               _observe_cb_response_error(sig_context->bus_name, sig_context->signum, ret);
+               _observe_cb_response_error(sig_context->bus_name, sig_context->signal_number, ret);
                free(observe_ctx->bus_name);
                if (observe_ctx->payload)
                        g_variant_unref(observe_ctx->payload);
@@ -836,8 +838,8 @@ static int _worker_presence_cb(void *context)
        value = g_variant_new("(iusiis)", ctx->result, ctx->nonce, addr, conn_type,
                        ctx->trigger, ic_utils_dbus_encode_str(ctx->resource_type));
 
-       ret = _ocprocess_response_signal(ctx->bus_name, IC_DBUS_SIGNAL_PRESENCE, ctx->signum,
-                       value);
+       ret = _ocprocess_response_signal(ctx->bus_name, IC_DBUS_SIGNAL_PRESENCE,
+                       ctx->signal_number, value);
        if (IOTCON_ERROR_NONE != ret)
                ERR("_ocprocess_response_signal() Fail(%d)", ret);
 
@@ -851,7 +853,7 @@ static int _worker_presence_cb(void *context)
 }
 
 
-static void _presence_cb_response_error(const char *dest, unsigned int signum,
+static void _presence_cb_response_error(const char *dest, unsigned int signal_number,
                int ret_val)
 {
        FN_CALL;
@@ -861,7 +863,7 @@ static void _presence_cb_response_error(const char *dest, unsigned int signum,
        value = g_variant_new("(iusiis)", ret_val, 0, IC_STR_NULL, IOTCON_CONNECTIVITY_ALL,
                        IOTCON_PRESENCE_TRIGGER_RESOURCE_CREATED, IC_STR_NULL);
 
-       ret = _ocprocess_response_signal(dest, IC_DBUS_SIGNAL_PRESENCE, signum, value);
+       ret = _ocprocess_response_signal(dest, IC_DBUS_SIGNAL_PRESENCE, signal_number, value);
        if (IOTCON_ERROR_NONE != ret)
                ERR("_ocprocess_response_signal() Fail(%d)", ret);
 }
@@ -907,7 +909,7 @@ OCStackApplicationResult icd_ioty_ocprocess_presence_cb(void *ctx, OCDoHandle ha
        presence_ctx = calloc(1, sizeof(struct icd_presence_context));
        if (NULL == presence_ctx) {
                ERR("calloc() Fail(%d)", errno);
-               _presence_cb_response_error(sig_context->bus_name, sig_context->signum,
+               _presence_cb_response_error(sig_context->bus_name, sig_context->signal_number,
                                IOTCON_ERROR_OUT_OF_MEMORY);
                return OC_STACK_KEEP_TRANSACTION;
        }
@@ -915,7 +917,7 @@ OCStackApplicationResult icd_ioty_ocprocess_presence_cb(void *ctx, OCDoHandle ha
        dev_addr = calloc(1, sizeof(OCDevAddr));
        if (NULL == dev_addr) {
                ERR("calloc() Fail(%d)", errno);
-               _presence_cb_response_error(sig_context->bus_name, sig_context->signum,
+               _presence_cb_response_error(sig_context->bus_name, sig_context->signal_number,
                                IOTCON_ERROR_OUT_OF_MEMORY);
                free(presence_ctx);
                return OC_STACK_KEEP_TRANSACTION;
@@ -930,7 +932,8 @@ OCStackApplicationResult icd_ioty_ocprocess_presence_cb(void *ctx, OCDoHandle ha
                ret = _presence_trigger_to_ioty_trigger(payload->trigger, &presence_ctx->trigger);
                if (IOTCON_ERROR_NONE != ret) {
                        ERR("_presence_trigger_to_ioty_trigger() Fail(%d)", ret);
-                       _presence_cb_response_error(sig_context->bus_name, sig_context->signum, ret);
+                       _presence_cb_response_error(sig_context->bus_name, sig_context->signal_number,
+                                       ret);
                        free(presence_ctx);
                        return OC_STACK_KEEP_TRANSACTION;
                }
@@ -947,7 +950,7 @@ OCStackApplicationResult icd_ioty_ocprocess_presence_cb(void *ctx, OCDoHandle ha
                presence_ctx->result = IOTCON_ERROR_IOTIVITY;
        }
 
-       presence_ctx->signum = sig_context->signum;
+       presence_ctx->signal_number = sig_context->signal_number;
        presence_ctx->bus_name = ic_utils_strdup(sig_context->bus_name);
        presence_ctx->nonce = resp->sequenceNumber;
        presence_ctx->dev_addr = dev_addr;
@@ -958,7 +961,7 @@ OCStackApplicationResult icd_ioty_ocprocess_presence_cb(void *ctx, OCDoHandle ha
        ret = _ocprocess_worker_start(_worker_presence_cb, presence_ctx);
        if (IOTCON_ERROR_NONE != ret) {
                ERR("_ocprocess_worker_start() Fail(%d)", ret);
-               _presence_cb_response_error(sig_context->bus_name, sig_context->signum, ret);
+               _presence_cb_response_error(sig_context->bus_name, sig_context->signal_number, ret);
                free(presence_ctx->resource_type);
                free(presence_ctx->bus_name);
                free(presence_ctx->dev_addr);
@@ -1000,7 +1003,7 @@ OCStackApplicationResult icd_ioty_ocprocess_info_cb(void *ctx, OCDoHandle handle
 
        info_ctx->info_type = info_type;
        info_ctx->payload = icd_payload_to_gvariant(resp->payload);
-       info_ctx->signum = sig_context->signum;
+       info_ctx->signal_number = sig_context->signal_number;
        info_ctx->bus_name = ic_utils_strdup(sig_context->bus_name);
 
        ret = _ocprocess_worker_start(_worker_info_cb, info_ctx);

diff --git a/daemon/icd-ioty.c b/daemon/icd-ioty.c
index da050e7..1627704 100644 (file)
--- a/daemon/icd-ioty.c
+++ b/daemon/icd-ioty.c
@@ -411,7 +411,7 @@ static void _ioty_free_signal_context(void *data)
 
 
 int icd_ioty_find_resource(const char *host_address, int conn_type,
-               const char *resource_type, unsigned int signum, const char *bus_name)
+               const char *resource_type, unsigned int signal_number, const char *bus_name)
 {
        int len;
        OCStackResult result;
@@ -441,7 +441,7 @@ int icd_ioty_find_resource(const char *host_address, int conn_type,
        }
 
        context->bus_name = ic_utils_strdup(bus_name);
-       context->signum = signum;
+       context->signal_number = signal_number;
 
        cbdata.context = context;
        cbdata.cb = icd_ioty_ocprocess_find_cb;
@@ -569,8 +569,12 @@ void icd_ioty_complete_error(int type, GDBusMethodInvocation *invocation, int re
 }
 
 
-static gboolean _icd_ioty_crud(int type, icDbus *object, GDBusMethodInvocation *invocation,
-               GVariant *resource, GVariant *query, GVariant *repr)
+static gboolean _icd_ioty_crud(int type,
+               icDbus *object,
+               GDBusMethodInvocation *invocation,
+               GVariant *resource,
+               GVariant *query,
+               GVariant *repr)
 {
        bool is_secure;
        OCMethod rest_type;
@@ -715,8 +719,8 @@ gboolean icd_ioty_delete(icDbus *object, GDBusMethodInvocation *invocation,
 }
 
 
-OCDoHandle icd_ioty_observer_start(GVariant *resource, int observe_type, GVariant *query,
-               unsigned int signal_number, const char *bus_name)
+OCDoHandle icd_ioty_observer_start(GVariant *resource, int observe_type,
+               GVariant *query, unsigned int signal_number, const char *bus_name)
 {
        bool is_secure;
        OCMethod method;
@@ -755,7 +759,7 @@ OCDoHandle icd_ioty_observer_start(GVariant *resource, int observe_type, GVarian
                return NULL;
        }
        context->bus_name = ic_utils_strdup(bus_name);
-       context->signum = signal_number;
+       context->signal_number = signal_number;
 
        cbdata.context = context;
        cbdata.cb = icd_ioty_ocprocess_observe_cb;
@@ -878,7 +882,7 @@ int icd_ioty_get_info(int type, const char *host_address, int conn_type,
                return IOTCON_ERROR_OUT_OF_MEMORY;
        }
        context->bus_name = ic_utils_strdup(bus_name);
-       context->signum = signal_number;
+       context->signal_number = signal_number;
 
        cbdata.context = context;
        cbdata.cb = icd_ioty_ocprocess_info_cb;
@@ -1183,7 +1187,7 @@ OCDoHandle icd_ioty_subscribe_presence(const char *host_address, int conn_type,
                return NULL;
        }
        context->bus_name = ic_utils_strdup(bus_name);
-       context->signum = signal_number;
+       context->signal_number = signal_number;
 
        cbdata.context = context;
        cbdata.cb = icd_ioty_ocprocess_presence_cb;

diff --git a/daemon/icd-ioty.h b/daemon/icd-ioty.h
index adf4e8b..4b7df2b 100644 (file)
--- a/daemon/icd-ioty.h
+++ b/daemon/icd-ioty.h
@@ -37,7 +37,7 @@
 #define ICD_IOTY_TIZEN_INFO_TIZEN_DEVICE_ID "tizen_device_id"
 
 typedef struct {
-       unsigned int signum;
+       unsigned int signal_number;
        char *bus_name;
 } icd_sig_ctx_s;
 
@@ -94,8 +94,8 @@ gboolean icd_ioty_post(icDbus *object, GDBusMethodInvocation *invocation,
 gboolean icd_ioty_delete(icDbus *object, GDBusMethodInvocation *invocation,
                GVariant *resource);
 
-OCDoHandle icd_ioty_observer_start(GVariant *resource, int observe_type, GVariant *query,
-               unsigned int signal_number, const char *bus_name);
+OCDoHandle icd_ioty_observer_start(GVariant *resource, int observe_type,
+               GVariant *query, unsigned int signal_number, const char *bus_name);
 
 int icd_ioty_observer_stop(OCDoHandle handle, GVariant *options);
 

diff --git a/lib/icl-dbus.c b/lib/icl-dbus.c
index 42bdb60..9181069 100644 (file)
--- a/lib/icl-dbus.c
+++ b/lib/icl-dbus.c
@@ -50,8 +50,8 @@ unsigned int icl_dbus_generate_signal_number()
 }
 
 
-unsigned int icl_dbus_subscribe_signal(char *sig_name, void *cb_container, void *cb_free,
-               GDBusSignalCallback sig_handler)
+unsigned int icl_dbus_subscribe_signal(char *signal_name, void *cb_container,
+               void *cb_free, GDBusSignalCallback sig_handler)
 {
        unsigned int id;
        GDBusConnection *conn = g_dbus_proxy_get_connection(G_DBUS_PROXY(icl_dbus_object));
@@ -59,7 +59,7 @@ unsigned int icl_dbus_subscribe_signal(char *sig_name, void *cb_container, void
        id = g_dbus_connection_signal_subscribe(conn,
                        NULL,
                        IOTCON_DBUS_INTERFACE,
-                       sig_name,
+                       signal_name,
                        IOTCON_DBUS_OBJPATH,
                        NULL,
                        G_DBUS_SIGNAL_FLAGS_NONE,

diff --git a/lib/icl-dbus.h b/lib/icl-dbus.h
index e8fdd62..d835d33 100644 (file)
--- a/lib/icl-dbus.h
+++ b/lib/icl-dbus.h
@@ -25,11 +25,12 @@
 icDbus* icl_dbus_get_object();
 unsigned int icl_dbus_generate_signal_number();
 
-unsigned int icl_dbus_subscribe_signal(char *sig_name, void *cb_container, void *cb_free,
-               GDBusSignalCallback sig_handler);
+unsigned int icl_dbus_subscribe_signal(char *signal_name, void *cb_container,
+               void *cb_free, GDBusSignalCallback sig_handler);
 void icl_dbus_unsubscribe_signal(unsigned int id);
 
-int icl_dbus_add_connection_changed_cb(iotcon_connection_changed_cb cb, void *user_data);
+int icl_dbus_add_connection_changed_cb(iotcon_connection_changed_cb cb,
+               void *user_data);
 int icl_dbus_remove_connection_changed_cb(iotcon_connection_changed_cb cb,
                void *user_data);
 

diff --git a/lib/icl-device.c b/lib/icl-device.c
index 4f2c502..70c72d0 100644 (file)
--- a/lib/icl-device.c
+++ b/lib/icl-device.c
@@ -138,11 +138,11 @@ API int iotcon_get_device_info(const char *host_address,
                iotcon_device_info_cb cb,
                void *user_data)
 {
+       int ret;
        GError *error = NULL;
-       unsigned int sub_id;
-       int ret, signal_number;
-       char signal_name[IC_DBUS_SIGNAL_LENGTH] = {0};
        icl_device_info_s *cb_container;
+       unsigned int sub_id, signal_number;
+       char signal_name[IC_DBUS_SIGNAL_LENGTH] = {0};
 
        RETV_IF(NULL == icl_dbus_get_object(), IOTCON_ERROR_DBUS);
        RETV_IF(NULL == host_address, IOTCON_ERROR_INVALID_PARAMETER);
@@ -311,11 +311,11 @@ API int iotcon_get_platform_info(const char *host_address,
                iotcon_platform_info_cb cb,
                void *user_data)
 {
+       int ret;
        GError *error = NULL;
-       unsigned int sub_id;
-       int ret, signal_number;
-       char signal_name[IC_DBUS_SIGNAL_LENGTH] = {0};
        icl_platform_info_s *cb_container;
+       unsigned int sub_id, signal_number;
+       char signal_name[IC_DBUS_SIGNAL_LENGTH] = {0};
 
        RETV_IF(NULL == icl_dbus_get_object(), IOTCON_ERROR_DBUS);
        RETV_IF(NULL == host_address, IOTCON_ERROR_INVALID_PARAMETER);

diff --git a/lib/icl-lite-resource.c b/lib/icl-lite-resource.c
index e0f1360..011923f 100644 (file)
--- a/lib/icl-lite-resource.c
+++ b/lib/icl-lite-resource.c
@@ -274,12 +274,12 @@ API int iotcon_lite_resource_create(const char *uri_path,
                iotcon_state_h state,
                iotcon_lite_resource_h *resource_handle)
 {
-       unsigned int sub_id;
+       int ret, iface;
        const gchar **types;
        GError *error = NULL;
-       int ret, iface, signal_number;
        iotcon_lite_resource_h resource;
-       char sig_name[IC_DBUS_SIGNAL_LENGTH];
+       unsigned int sub_id, signal_number;
+       char signal_name[IC_DBUS_SIGNAL_LENGTH];
 
        RETV_IF(NULL == icl_dbus_get_object(), IOTCON_ERROR_DBUS);
        RETV_IF(NULL == uri_path, IOTCON_ERROR_INVALID_PARAMETER);
@@ -333,10 +333,10 @@ API int iotcon_lite_resource_create(const char *uri_path,
                return ret;
        }
 
-       snprintf(sig_name, sizeof(sig_name), "%s_%u", IC_DBUS_SIGNAL_REQUEST_HANDLER,
+       snprintf(signal_name, sizeof(signal_name), "%s_%u", IC_DBUS_SIGNAL_REQUEST_HANDLER,
                        signal_number);
 
-       sub_id = icl_dbus_subscribe_signal(sig_name, resource,
+       sub_id = icl_dbus_subscribe_signal(signal_name, resource,
                        _icl_lite_resource_conn_cleanup, _icl_lite_resource_request_handler);
        if (0 == sub_id) {
                ERR("icl_dbus_subscribe_signal() Fail");

diff --git a/lib/icl-presence.c b/lib/icl-presence.c
index e2515db..70d2830 100644 (file)
--- a/lib/icl-presence.c
+++ b/lib/icl-presence.c
@@ -160,11 +160,11 @@ API int iotcon_add_presence_cb(const char *host_address,
                iotcon_presence_h *presence_handle)
 {
        FN_CALL;
+       int ret;
        GError *error = NULL;
-       unsigned int sub_id;
-       int signal_number, ret;
-       char signal_name[IC_DBUS_SIGNAL_LENGTH] = {0};
        icl_presence_s *presence;
+       unsigned int sub_id, signal_number;
+       char signal_name[IC_DBUS_SIGNAL_LENGTH] = {0};
 
        RETV_IF(NULL == icl_dbus_get_object(), IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == host_address, IOTCON_ERROR_INVALID_PARAMETER);

diff --git a/lib/icl-remote-resource-crud.c b/lib/icl-remote-resource-crud.c
index 64f26e4..108bc9c 100644 (file)
--- a/lib/icl-remote-resource-crud.c
+++ b/lib/icl-remote-resource-crud.c
@@ -414,8 +414,9 @@ int icl_remote_resource_observer_start(iotcon_remote_resource_h resource,
                unsigned int *sub_id,
                int64_t *observe_handle)
 {
+       int ret;
        GError *error = NULL;
-       int ret, signal_number;
+       unsigned int signal_number;
        GVariant *arg_query, *arg_remote_resource;
        char signal_name[IC_DBUS_SIGNAL_LENGTH] = {0};
 

diff --git a/lib/icl-remote-resource.c b/lib/icl-remote-resource.c
index 6331c20..ace611c 100644 (file)
--- a/lib/icl-remote-resource.c
+++ b/lib/icl-remote-resource.c
@@ -99,10 +99,10 @@ API int iotcon_find_resource(const char *host_address,
                iotcon_found_resource_cb cb,
                void *user_data)
 {
-       unsigned int sub_id;
+       int ret;
        GError *error = NULL;
-       int ret, signal_number;
        icl_found_resource_s *cb_container;
+       unsigned int sub_id, signal_number;
        char signal_name[IC_DBUS_SIGNAL_LENGTH] = {0};
 
        RETV_IF(NULL == icl_dbus_get_object(), IOTCON_ERROR_DBUS);

diff --git a/lib/icl-resource.c b/lib/icl-resource.c
index 56327e4..8a32a5b 100644 (file)
--- a/lib/icl-resource.c
+++ b/lib/icl-resource.c
@@ -161,12 +161,12 @@ API int iotcon_resource_create(const char *uri_path,
                void *user_data,
                iotcon_resource_h *resource_handle)
 {
-       unsigned int sub_id;
-       GError *error = NULL;
+       int ret;
        const gchar **types;
+       GError *error = NULL;
        iotcon_resource_h resource;
-       int signal_number, ret;
-       char sig_name[IC_DBUS_SIGNAL_LENGTH];
+       unsigned int sub_id, signal_number;
+       char signal_name[IC_DBUS_SIGNAL_LENGTH];
 
        RETV_IF(NULL == icl_dbus_get_object(), IOTCON_ERROR_DBUS);
        RETV_IF(NULL == uri_path, IOTCON_ERROR_INVALID_PARAMETER);
@@ -216,10 +216,10 @@ API int iotcon_resource_create(const char *uri_path,
        resource->ifaces = ifaces;
        resource->properties = properties;
 
-       snprintf(sig_name, sizeof(sig_name), "%s_%u", IC_DBUS_SIGNAL_REQUEST_HANDLER,
+       snprintf(signal_name, sizeof(signal_name), "%s_%u", IC_DBUS_SIGNAL_REQUEST_HANDLER,
                        signal_number);
 
-       sub_id = icl_dbus_subscribe_signal(sig_name, resource, _icl_resource_conn_cleanup,
+       sub_id = icl_dbus_subscribe_signal(signal_name, resource, _icl_resource_conn_cleanup,
                        _icl_request_handler);
        if (0 == sub_id) {
                ERR("icl_dbus_subscribe_signal() Fail");