Fix API name (observer_id/action -> observe_id/action)

Change-Id: I2ba30b3120766d774c286dbfcd3ab74420e3da33

diff --git a/daemon/icd-ioty-ocprocess.c b/daemon/icd-ioty-ocprocess.c
index 1d19907..b167a8f 100644 (file)
--- a/daemon/icd-ioty-ocprocess.c
+++ b/daemon/icd-ioty-ocprocess.c
@@ -46,7 +46,7 @@ struct icd_req_context {
        unsigned int signal_number;
        char *bus_name;
        int types;
-       int observer_id;
+       int observe_id;
        int observe_action;
        OCRequestHandle request_h;
        OCResourceHandle resource_h;
@@ -258,7 +258,7 @@ static int _worker_req_handler(void *context)
                        ctx->options,
                        ctx->query,
                        action,
-                       ctx->observer_id,
+                       ctx->observe_id,
                        &payload_builder,
                        ICD_POINTER_TO_INT64(ctx->request_h),
                        ICD_POINTER_TO_INT64(ctx->resource_h));
@@ -332,7 +332,7 @@ OCEntityHandlerResult icd_ioty_ocprocess_req_handler(OCEntityHandlerFlag flag,
                        if (OC_OBSERVE_FLAG & flag) {
                                req_ctx->types |= IOTCON_REQUEST_OBSERVE;
                                /* observation info*/
-                               req_ctx->observer_id = request->obsInfo.obsId;
+                               req_ctx->observe_id = request->obsInfo.obsId;
                                req_ctx->observe_action = request->obsInfo.action;
                        }
                        break;

diff --git a/doc/iotcon_doc.h b/doc/iotcon_doc.h
index d0d5fb8..7eb79b3 100644 (file)
--- a/doc/iotcon_doc.h
+++ b/doc/iotcon_doc.h
@@ -236,8 +236,8 @@ static void _request_handler(iotcon_request_h request, void *user_data)
 {
        int ret;
        int types;
-       int observer_id;
-       iotcon_observe_action_e observer_action;
+       int observe_id;
+       iotcon_observe_action_e observe_action;
 
        ret = iotcon_request_get_types(request, &types);
        if (IOTCON_ERROR_NONE != ret) {
@@ -245,26 +245,26 @@ static void _request_handler(iotcon_request_h request, void *user_data)
        }
 
        if (IOTCON_REQUEST_OBSERVE & types) {
-               ret = iotcon_request_get_observer_action(request, &observer_action);
+               ret = iotcon_request_get_observe_action(request, &observe_action);
                if (IOTCON_ERROR_NONE != ret) {
                        return;
                }
 
-               if (IOTCON_OBSERVE_REGISTER == observer_action) {
-                       ret = iotcon_request_get_observer_id(request, &observer_id);
+               if (IOTCON_OBSERVE_REGISTER == observe_action) {
+                       ret = iotcon_request_get_observe_id(request, &observe_id);
                        if (IOTCON_ERROR_NONE != ret) {
                                return;
                        }
-                       ret = iotcon_observers_add(observers, observer_id);
+                       ret = iotcon_observers_add(observers, observe_id);
                        if (IOTCON_ERROR_NONE != ret) {
                                return;
                        }
-               } else if (IOTCON_OBSERVE_DEREGISTER == observer_action) {
-                       ret = iotcon_request_get_observer_id(request, &observer_id);
+               } else if (IOTCON_OBSERVE_DEREGISTER == observe_action) {
+                       ret = iotcon_request_get_observe_id(request, &observe_id);
                        if (IOTCON_ERROR_NONE != ret) {
                                return;
                        }
-                       ret = iotcon_observers_remove(observers, observer_id);
+                       ret = iotcon_observers_remove(observers, observe_id);
                        if (IOTCON_ERROR_NONE != ret) {
                                return;
                        }

diff --git a/lib/icl-lite-resource.c b/lib/icl-lite-resource.c
index 011923f..90bb996 100644 (file)
--- a/lib/icl-lite-resource.c
+++ b/lib/icl-lite-resource.c
@@ -169,7 +169,7 @@ static void _icl_lite_resource_request_handler(GDBusConnection *connection,
                        NULL,   /* header options */
                        NULL,   /* query */
                        NULL,   /* observe action */
-                       NULL,   /* observer_id */
+                       NULL,   /* observe_id */
                        &repr_iter,
                        &oic_request_h,
                        &oic_resource_h);

diff --git a/lib/icl-request.c b/lib/icl-request.c
index 44fe1fd..f8a5ee8 100644 (file)
--- a/lib/icl-request.c
+++ b/lib/icl-request.c
@@ -90,7 +90,7 @@ API int iotcon_request_get_query(iotcon_request_h request, iotcon_query_h *query
 }
 
 
-API int iotcon_request_get_observer_action(iotcon_request_h request,
+API int iotcon_request_get_observe_action(iotcon_request_h request,
                iotcon_observe_action_e *action)
 {
        RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
@@ -102,12 +102,12 @@ API int iotcon_request_get_observer_action(iotcon_request_h request,
 }
 
 
-API int iotcon_request_get_observer_id(iotcon_request_h request, int *observer_id)
+API int iotcon_request_get_observe_id(iotcon_request_h request, int *observe_id)
 {
        RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
-       RETV_IF(NULL == observer_id, IOTCON_ERROR_INVALID_PARAMETER);
+       RETV_IF(NULL == observe_id, IOTCON_ERROR_INVALID_PARAMETER);
 
-       *observer_id = request->observation_info.observer_id;
+       *observe_id = request->observation_info.observe_id;
 
        return IOTCON_ERROR_NONE;
 }

diff --git a/lib/icl-request.h b/lib/icl-request.h
index 750100c..b48b428 100644 (file)
--- a/lib/icl-request.h
+++ b/lib/icl-request.h
@@ -22,7 +22,7 @@
 
 struct icl_observe_info {
        iotcon_observe_action_e action;
-       int observer_id;
+       int observe_id;
 };
 
 struct icl_resource_request {

diff --git a/lib/icl-resource.c b/lib/icl-resource.c
index 8a32a5b..30a9522 100644 (file)
--- a/lib/icl-resource.c
+++ b/lib/icl-resource.c
@@ -61,7 +61,7 @@ static void _icl_request_handler(GDBusConnection *connection,
                        &options,
                        &query,
                        &request.observation_info.action,
-                       &request.observation_info.observer_id,
+                       &request.observation_info.observe_id,
                        &repr_iter,
                        &request.oic_request_h,
                        &request.oic_resource_h);
@@ -112,13 +112,13 @@ static void _icl_request_handler(GDBusConnection *connection,
 
        /* for iotcon_resource_notify */
        if (IOTCON_REQUEST_OBSERVE & request.types) {
-               int observer_id = request.observation_info.observer_id;
+               int observe_id = request.observation_info.observe_id;
                if (IOTCON_OBSERVE_REGISTER == request.observation_info.action) {
                        if (NULL == resource->observers)
                                iotcon_observers_create(&resource->observers);
-                       iotcon_observers_add(resource->observers, observer_id);
+                       iotcon_observers_add(resource->observers, observe_id);
                } else if (IOTCON_OBSERVE_DEREGISTER == request.observation_info.action) {
-                       iotcon_observers_remove(resource->observers, observer_id);
+                       iotcon_observers_remove(resource->observers, observe_id);
                }
        }
 

diff --git a/lib/include/iotcon-request.h b/lib/include/iotcon-request.h
index a3d857e..9dac916 100644 (file)
--- a/lib/include/iotcon-request.h
+++ b/lib/include/iotcon-request.h
@@ -53,8 +53,8 @@
  * @see iotcon_request_get_types()
  * @see iotcon_request_get_options()
  * @see iotcon_request_get_query()
- * @see iotcon_request_get_observer_action()
- * @see iotcon_request_get_observer_id()
+ * @see iotcon_request_get_observe_action()
+ * @see iotcon_request_get_observe_id()
  */
 int iotcon_request_get_host_address(iotcon_request_h request,
                char **host_address);
@@ -76,8 +76,8 @@ int iotcon_request_get_host_address(iotcon_request_h request,
  * @see iotcon_request_get_types()
  * @see iotcon_request_get_options()
  * @see iotcon_request_get_query()
- * @see iotcon_request_get_observer_action()
- * @see iotcon_request_get_observer_id()
+ * @see iotcon_request_get_observe_action()
+ * @see iotcon_request_get_observe_id()
  */
 int iotcon_request_get_connectivity_type(iotcon_request_h request,
                iotcon_connectivity_type_e *connectivity_type);
@@ -101,8 +101,8 @@ int iotcon_request_get_connectivity_type(iotcon_request_h request,
  * @see iotcon_request_get_types()
  * @see iotcon_request_get_options()
  * @see iotcon_request_get_query()
- * @see iotcon_request_get_observer_action()
- * @see iotcon_request_get_observer_id()
+ * @see iotcon_request_get_observe_action()
+ * @see iotcon_request_get_observe_id()
  */
 int iotcon_request_get_representation(iotcon_request_h request,
                iotcon_representation_h *repr);
@@ -124,8 +124,8 @@ int iotcon_request_get_representation(iotcon_request_h request,
  * @see iotcon_request_get_representation()
  * @see iotcon_request_get_options()
  * @see iotcon_request_get_query()
- * @see iotcon_request_get_observer_action()
- * @see iotcon_request_get_observer_id()
+ * @see iotcon_request_get_observe_action()
+ * @see iotcon_request_get_observe_id()
  */
 int iotcon_request_get_types(iotcon_request_h request, int *types);
 
@@ -148,8 +148,8 @@ int iotcon_request_get_types(iotcon_request_h request, int *types);
  * @see iotcon_request_get_representation()
  * @see iotcon_request_get_types()
  * @see iotcon_request_get_query()
- * @see iotcon_request_get_observer_action()
- * @see iotcon_request_get_observer_id()
+ * @see iotcon_request_get_observe_action()
+ * @see iotcon_request_get_observe_id()
  */
 int iotcon_request_get_options(iotcon_request_h request, iotcon_options_h *options);
 
@@ -172,8 +172,8 @@ int iotcon_request_get_options(iotcon_request_h request, iotcon_options_h *optio
  * @see iotcon_request_get_representation()
  * @see iotcon_request_get_types()
  * @see iotcon_request_get_options()
- * @see iotcon_request_get_observer_action()
- * @see iotcon_request_get_observer_id()
+ * @see iotcon_request_get_observe_action()
+ * @see iotcon_request_get_observe_id()
  */
 int iotcon_request_get_query(iotcon_request_h request, iotcon_query_h *query);
 
@@ -196,9 +196,9 @@ int iotcon_request_get_query(iotcon_request_h request, iotcon_query_h *query);
  * @see iotcon_request_get_types()
  * @see iotcon_request_get_options()
  * @see iotcon_request_get_query()
- * @see iotcon_request_get_observer_id()
+ * @see iotcon_request_get_observe_id()
  */
-int iotcon_request_get_observer_action(iotcon_request_h request,
+int iotcon_request_get_observe_action(iotcon_request_h request,
                iotcon_observe_action_e *action);
 
 /**
@@ -207,7 +207,7 @@ int iotcon_request_get_observer_action(iotcon_request_h request,
  * @since_tizen 3.0
  *
  * @param[in] request The handle of the request
- * @param[out] observer_id The id of the observer
+ * @param[out] observe_id The id of the observer
  *
  * @return 0 on success, otherwise a negative error value.
  * @retval #IOTCON_ERROR_NONE  Successful
@@ -219,9 +219,9 @@ int iotcon_request_get_observer_action(iotcon_request_h request,
  * @see iotcon_request_get_types()
  * @see iotcon_request_get_options()
  * @see iotcon_request_get_query()
- * @see iotcon_request_get_observer_action()
+ * @see iotcon_request_get_observe_action()
  */
-int iotcon_request_get_observer_id(iotcon_request_h request, int *observer_id);
+int iotcon_request_get_observe_id(iotcon_request_h request, int *observe_id);
 
 /**
  * @}

diff --git a/test/iotcon-test-basic-server.c b/test/iotcon-test-basic-server.c
index 4806f93..8d4e8e7 100644 (file)
--- a/test/iotcon-test-basic-server.c
+++ b/test/iotcon-test-basic-server.c
@@ -422,8 +422,8 @@ static void _request_handler(iotcon_resource_h resource, iotcon_request_h reques
        door_resource_s *door;
        iotcon_query_h query;
        iotcon_response_h response = NULL;
-       int ret, types, observer_id;
-       iotcon_observe_action_e observer_action;
+       int ret, types, observe_id;
+       iotcon_observe_action_e observe_action;
        char *host_address;
 
        RET_IF(NULL == request);
@@ -472,26 +472,26 @@ static void _request_handler(iotcon_resource_h resource, iotcon_request_h reques
        INFO("host_address : %s", host_address);
 
        if (IOTCON_REQUEST_OBSERVE & types) {
-               ret = iotcon_request_get_observer_action(request, &observer_action);
+               ret = iotcon_request_get_observe_action(request, &observe_action);
                if (IOTCON_ERROR_NONE != ret) {
-                       ERR("iotcon_request_get_observer_action() Fail(%d)", ret);
+                       ERR("iotcon_request_get_observe_action() Fail(%d)", ret);
                        return;
                }
 
-               if (IOTCON_OBSERVE_REGISTER == observer_action) {
-                       ret = iotcon_request_get_observer_id(request, &observer_id);
+               if (IOTCON_OBSERVE_REGISTER == observe_action) {
+                       ret = iotcon_request_get_observe_id(request, &observe_id);
                        if (IOTCON_ERROR_NONE != ret) {
-                               ERR("iotcon_request_get_observer_id() Fail(%d)", ret);
+                               ERR("iotcon_request_get_observe_id() Fail(%d)", ret);
                                return;
                        }
-                       ret = iotcon_observers_add(door->observers, observer_id);
-               } else if (IOTCON_OBSERVE_DEREGISTER == observer_action) {
-                       ret = iotcon_request_get_observer_id(request, &observer_id);
+                       ret = iotcon_observers_add(door->observers, observe_id);
+               } else if (IOTCON_OBSERVE_DEREGISTER == observe_action) {
+                       ret = iotcon_request_get_observe_id(request, &observe_id);
                        if (IOTCON_ERROR_NONE != ret) {
-                               ERR("iotcon_request_get_observer_id() Fail(%d)", ret);
+                               ERR("iotcon_request_get_observe_id() Fail(%d)", ret);
                                return;
                        }
-                       ret = iotcon_observers_remove(door->observers, observer_id);
+                       ret = iotcon_observers_remove(door->observers, observe_id);
                        if (IOTCON_ERROR_NONE != ret) {
                                ERR("iotcon_observers_remove() Fail(%d)", ret);
                                return;