(ACR) Chagne API name : observe_start/stop -> start/stop_observing

Change-Id: I4933d643a79194d5d679e1762ed38b85c6603f1c

diff --git a/doc/iotcon_doc.h b/doc/iotcon_doc.h
index 6c1235e67e47c508a9d04dcc78b9e9c5bbf65f30..fa106b77577d5e093dd561ba77e49eefdde3d441 100644 (file)
--- a/doc/iotcon_doc.h
+++ b/doc/iotcon_doc.h
@@ -351,7 +351,7 @@ static void _on_observe(iotcon_options_h header_options, iotcon_representation_h
 ...
 {
        int ret;
-       ret = iotcon_remote_resource_observer_start(door_resource, IOTCON_OBSERVE_ALL, NULL,
+       ret = iotcon_remote_resource_start_observing(door_resource, IOTCON_OBSERVE_ALL, NULL,
                        &_on_observe, NULL);
        if (IOTCON_ERROR_NONE != ret)
                return;

diff --git a/lib/icl-remote-resource-caching.c b/lib/icl-remote-resource-caching.c
index cb3b8202fe022a79b6778bbfa978a3e16460982a..036f411918b3c1091bf6fa61826d76c237fb49a5 100644 (file)
--- a/lib/icl-remote-resource-caching.c
+++ b/lib/icl-remote-resource-caching.c
@@ -285,12 +285,12 @@ static int _caching_observer_stop(iotcon_remote_resource_h resource)
                return IOTCON_ERROR_INVALID_PARAMETER;
        }
 
-       ret = icl_remote_resource_observer_stop(resource,
+       ret = icl_remote_resource_stop_observing(resource,
                        NULL,
                        resource->caching_handle->observe_handle,
                        resource->caching_handle->observe_sub_id);
        if (IOTCON_ERROR_NONE != ret) {
-               ERR("icl_remote_resource_observer_stop() Fail(%d)", ret);
+               ERR("icl_remote_resource_stop_observing() Fail(%d)", ret);
                return ret;
        }
 

diff --git a/lib/icl-remote-resource-crud.c b/lib/icl-remote-resource-crud.c
index 7398203aed57a323101dfbe7807eb541920308d6..007d03fe1d793ec9cdbfdb48f9a6f29ee3280a71 100644 (file)
--- a/lib/icl-remote-resource-crud.c
+++ b/lib/icl-remote-resource-crud.c
@@ -528,7 +528,7 @@ int icl_remote_resource_observer_start(iotcon_remote_resource_h resource,
 }
 
 
-API int iotcon_remote_resource_observer_start(iotcon_remote_resource_h resource,
+API int iotcon_remote_resource_start_observing(iotcon_remote_resource_h resource,
                iotcon_observe_type_e observe_type,
                iotcon_query_h query,
                iotcon_remote_resource_observe_cb cb,
@@ -574,7 +574,7 @@ API int iotcon_remote_resource_observer_start(iotcon_remote_resource_h resource,
 }
 
 
-int icl_remote_resource_observer_stop(iotcon_remote_resource_h resource,
+int icl_remote_resource_stop_observing(iotcon_remote_resource_h resource,
                iotcon_options_h options, int64_t handle, unsigned int sub_id)
 {
        int ret;
@@ -614,10 +614,10 @@ API int iotcon_remote_resource_observer_stop(iotcon_remote_resource_h resource)
                return IOTCON_ERROR_INVALID_PARAMETER;
        }
 
-       ret = icl_remote_resource_observer_stop(resource, resource->header_options,
+       ret = icl_remote_resource_stop_observing(resource, resource->header_options,
                        resource->observe_handle, resource->observe_sub_id);
        if (IOTCON_ERROR_NONE != ret) {
-               ERR("icl_remote_resource_observer_stop() Fail(%d)", ret);
+               ERR("icl_remote_resource_stop_observing() Fail(%d)", ret);
                return ret;
        }
 

diff --git a/lib/icl-remote-resource.h b/lib/icl-remote-resource.h
index 49cde6ad72e803e2beb6818ad98e27f0ebb0a5d2..cab7a747d24afd716f2043f98d434dd7b04438ea 100644 (file)
--- a/lib/icl-remote-resource.h
+++ b/lib/icl-remote-resource.h
@@ -80,7 +80,7 @@ int icl_remote_resource_observer_start(iotcon_remote_resource_h resource,
                unsigned int *sub_id,
                int64_t *observe_handle);
 
-int icl_remote_resource_observer_stop(iotcon_remote_resource_h resource,
+int icl_remote_resource_stop_observing(iotcon_remote_resource_h resource,
                iotcon_options_h options, int64_t handle, unsigned int sub_id);
 
 #endif /* __IOT_CONNECTIVITY_MANAGER_LIBRARY_CLIENT_H__ */

diff --git a/lib/include/iotcon-notimsg.h b/lib/include/iotcon-notimsg.h
index c2fc8a83987c43c8e73a4016d7418097b6d91932..fc029e577b7f3b9a8de528efacdc81074bb691b1 100644 (file)
--- a/lib/include/iotcon-notimsg.h
+++ b/lib/include/iotcon-notimsg.h
@@ -50,7 +50,7 @@
  * @retval #IOTCON_ERROR_OUT_OF_MEMORY  Out of memory
  *
  * @see iotcon_remote_resource_observe_cb()
- * @see iotcon_remote_resource_observer_start()
+ * @see iotcon_remote_resource_start_observing()
  * @see iotcon_remote_resource_observer_stop()
  * @see iotcon_resource_notify()
  */

diff --git a/lib/include/iotcon-remote-resource.h b/lib/include/iotcon-remote-resource.h
index 26992216ca45f912ea0e41b05d68b7aa7e462740..d8f7068a16264cd97f27b470262295d67d72a692 100644 (file)
--- a/lib/include/iotcon-remote-resource.h
+++ b/lib/include/iotcon-remote-resource.h
@@ -105,7 +105,7 @@ void iotcon_remote_resource_destroy(iotcon_remote_resource_h resource);
 int iotcon_remote_resource_clone(iotcon_remote_resource_h src, iotcon_remote_resource_h *dest);
 
 /**
- * @brief Specifies the type of function passed to iotcon_remote_resource_observer_start().
+ * @brief Specifies the type of function passed to iotcon_remote_resource_start_observing().
  * @details Called when a client receive notifications from a server. The @a response_result could be one of #iotcon_response_result_e.
  *
  * @since_tizen 3.0
@@ -117,9 +117,9 @@ int iotcon_remote_resource_clone(iotcon_remote_resource_h src, iotcon_remote_res
  * @param[in] sequence_number The sequence of notifications from server.
  * @param[in] user_data The user data passed from the callback registration function
  *
- * @pre The callback must be registered using iotcon_remote_resource_observer_start()
+ * @pre The callback must be registered using iotcon_remote_resource_start_observing()
  *
- * @see iotcon_remote_resource_observer_start()
+ * @see iotcon_remote_resource_start_observing()
  */
 typedef void (*iotcon_remote_resource_observe_cb)(iotcon_remote_resource_h resource,
                iotcon_representation_h repr,
@@ -158,7 +158,7 @@ typedef void (*iotcon_remote_resource_observe_cb)(iotcon_remote_resource_h resou
  * @see iotcon_notimsg_create()
  * @see iotcon_resource_notify()
  */
-int iotcon_remote_resource_observer_start(iotcon_remote_resource_h resource,
+int iotcon_remote_resource_start_observing(iotcon_remote_resource_h resource,
                iotcon_observe_type_e observe_type,
                iotcon_query_h query,
                iotcon_remote_resource_observe_cb cb,
@@ -181,7 +181,7 @@ int iotcon_remote_resource_observer_start(iotcon_remote_resource_h resource,
  * @retval #IOTCON_ERROR_PERMISSION_DENIED Permission denied
  *
  * @see iotcon_remote_resource_observe_cb()
- * @see iotcon_remote_resource_observer_start()
+ * @see iotcon_remote_resource_start_observing()
  * @see iotcon_notimsg_create()
  * @see iotcon_resource_notify()
  */

diff --git a/lib/include/iotcon-resource.h b/lib/include/iotcon-resource.h
index 26b18d21edc10effb6c5ffedf8706dd00dca35a1..49c254daa2c38d527c4b1569b9408e90a4f97101 100644 (file)
--- a/lib/include/iotcon-resource.h
+++ b/lib/include/iotcon-resource.h
@@ -303,7 +303,7 @@ int iotcon_resource_unbind_child_resource(iotcon_resource_h parent,
  * @retval #IOTCON_ERROR_PERMISSION_DENIED Permission denied
  *
  * @see iotcon_remote_resource_observe_cb()
- * @see iotcon_remote_resource_observer_start()
+ * @see iotcon_remote_resource_start_observing()
  * @see iotcon_remote_resource_observer_stop()
  * @see iotcon_notimsg_create()
  * @see iotcon_notimsg_destroy()

diff --git a/test/iotcon-test-basic-client.c b/test/iotcon-test-basic-client.c
index 0b6944f46e1d33706c6ecc4aff5d734e5172399f..18a4d8fe0336983f4b48d0126f4f621f813cb641 100644 (file)
--- a/test/iotcon-test-basic-client.c
+++ b/test/iotcon-test-basic-client.c
@@ -56,10 +56,10 @@ static void _on_delete(iotcon_remote_resource_h resource, iotcon_options_h heade
 
        /* delete callback operations */
 
-       ret = iotcon_remote_resource_observer_start(door_resource, IOTCON_OBSERVE_ALL, NULL,
+       ret = iotcon_remote_resource_start_observing(door_resource, IOTCON_OBSERVE_ALL, NULL,
                        _on_observe, NULL);
        if (IOTCON_ERROR_NONE != ret)
-               ERR("iotcon_remote_resource_observer_start() Fail(%d)", ret);
+               ERR("iotcon_remote_resource_start_observing() Fail(%d)", ret);
 
        iotcon_remote_resource_destroy(resource);
 }