(ACR) Change API name : iotcon_get_xxx -> iotcon_request_xxx

Change-Id: Ibd9a92981816ffff80b2afc40532885092779092

diff --git a/lib/icl-device.c b/lib/icl-device.c
index 770f99e..bc40813 100644 (file)
--- a/lib/icl-device.c
+++ b/lib/icl-device.c
@@ -135,7 +135,7 @@ static gboolean _icl_timeout_get_device_info(gpointer p)
        return G_SOURCE_REMOVE;
 }
 
-API int iotcon_get_device_info(const char *host_address,
+API int iotcon_request_device_info(const char *host_address,
                iotcon_connectivity_type_e connectivity_type,
                iotcon_device_info_cb cb,
                void *user_data)
@@ -300,7 +300,7 @@ static gboolean _icl_timeout_get_platform_info(gpointer p)
        return G_SOURCE_REMOVE;
 }
 
-API int iotcon_get_platform_info(const char *host_address,
+API int iotcon_request_platform_info(const char *host_address,
                iotcon_connectivity_type_e connectivity_type,
                iotcon_platform_info_cb cb,
                void *user_data)
@@ -398,7 +398,7 @@ static void _icl_tizen_info_cb(GObject *object, GAsyncResult *g_async_res,
 }
 
 
-API int iotcon_get_tizen_info(const char *host_address,
+API int iotcon_request_tizen_info(const char *host_address,
                iotcon_connectivity_type_e connectivity_type,
                iotcon_tizen_info_cb cb,
                void *user_data)

diff --git a/lib/include/iotcon-client.h b/lib/include/iotcon-client.h
index 0ceb1d0..4402be1 100644 (file)
--- a/lib/include/iotcon-client.h
+++ b/lib/include/iotcon-client.h
@@ -170,7 +170,7 @@ int iotcon_find_resource(const char *host_address,
                void *user_data);
 
 /**
- * @brief Specifies the type of function passed to iotcon_get_device_info().
+ * @brief Specifies the type of function passed to iotcon_request_device_info().
  *
  * @since_tizen 3.0
  *
@@ -178,9 +178,9 @@ int iotcon_find_resource(const char *host_address,
  * @param[in] result The result code (0 on success, other wise a negative error value)
  * @param[in] user_data The user data to pass to the function
  *
- * @pre iotcon_get_device_info() will invoke this callback function.
+ * @pre iotcon_request_device_info() will invoke this callback function.
  *
- * @see iotcon_get_device_info()
+ * @see iotcon_request_device_info()
  * @see iotcon_device_info_get_property()
  */
 typedef void (*iotcon_device_info_cb)(iotcon_device_info_h device_info, int result,
@@ -213,7 +213,7 @@ typedef void (*iotcon_device_info_cb)(iotcon_device_info_h device_info, int resu
  * @see iotcon_device_info_cb()
  * @see iotcon_device_info_get_property()
  */
-int iotcon_get_device_info(const char *host_address,
+int iotcon_request_device_info(const char *host_address,
                iotcon_connectivity_type_e connectivity_type,
                iotcon_device_info_cb cb,
                void *user_data);
@@ -232,13 +232,13 @@ int iotcon_get_device_info(const char *host_address,
  * @retval #IOTCON_ERROR_INVALID_PARAMETER  Invalid parameter
  *
  * @see iotcon_device_info_cb()
- * @see iotcon_get_device_info()
+ * @see iotcon_request_device_info()
  */
 int iotcon_device_info_get_property(iotcon_device_info_h device_info,
                iotcon_device_info_e property, char **value);
 
 /**
- * @brief Specifies the type of function passed to iotcon_get_platform_info().
+ * @brief Specifies the type of function passed to iotcon_request_platform_info().
  *
  * @since_tizen 3.0
  *
@@ -246,9 +246,9 @@ int iotcon_device_info_get_property(iotcon_device_info_h device_info,
  * @param[in] result The result code (0 on success, other wise a negative error value)
  * @param[in] user_data The user data to pass to the function
  *
- * @pre iotcon_get_platform_info() will invoke this callback function.
+ * @pre iotcon_request_platform_info() will invoke this callback function.
  *
- * @see iotcon_get_platform_info()
+ * @see iotcon_request_platform_info()
  * @see iotcon_platform_info_get_property()
  */
 typedef void (*iotcon_platform_info_cb)(iotcon_platform_info_h platform_info, int result,
@@ -283,7 +283,7 @@ typedef void (*iotcon_platform_info_cb)(iotcon_platform_info_h platform_info, in
  * @see iotcon_platform_info_cb()
  * @see iotcon_platform_info_get_property()
  */
-int iotcon_get_platform_info(const char *host_address,
+int iotcon_request_platform_info(const char *host_address,
                iotcon_connectivity_type_e connectivity_type,
                iotcon_platform_info_cb cb,
                void *user_data);
@@ -302,13 +302,13 @@ int iotcon_get_platform_info(const char *host_address,
  * @retval #IOTCON_ERROR_INVALID_PARAMETER  Invalid parameter
  *
  * @see iotcon_platform_info_cb()
- * @see iotcon_get_platform_info()
+ * @see iotcon_request_platform_info()
  */
 int iotcon_platform_info_get_property(iotcon_platform_info_h platform_info,
                iotcon_platform_info_e property, char **value);
 
 /**
- * @brief Specifies the type of function passed to iotcon_get_tizen_info().
+ * @brief Specifies the type of function passed to iotcon_request_tizen_info().
  *
  * @since_tizen 3.0
  *
@@ -316,9 +316,9 @@ int iotcon_platform_info_get_property(iotcon_platform_info_h platform_info,
  * @param[in] response_result The response result code (Lesser than 0 on fail, otherwise a response result value)
  * @param[in] user_data The user data to pass to the function
  *
- * @pre iotcon_get_tizen_info() will invoke this callback function.
+ * @pre iotcon_request_tizen_info() will invoke this callback function.
  *
- * @see iotcon_get_tizen_info()
+ * @see iotcon_request_tizen_info()
  * @see iotcon_tizen_info_get_property()
  */
 typedef void (*iotcon_tizen_info_cb)(iotcon_tizen_info_h tizen_info,
@@ -351,7 +351,7 @@ typedef void (*iotcon_tizen_info_cb)(iotcon_tizen_info_h tizen_info,
  * @see iotcon_tizen_info_cb()
  * @see iotcon_tizen_info_get_property()
  */
-int iotcon_get_tizen_info(const char *host_address,
+int iotcon_request_tizen_info(const char *host_address,
                iotcon_connectivity_type_e connectivity_type,
                iotcon_tizen_info_cb cb,
                void *user_data);
@@ -370,7 +370,7 @@ int iotcon_get_tizen_info(const char *host_address,
  * @retval #IOTCON_ERROR_INVALID_PARAMETER  Invalid parameter
  *
  * @see iotcon_tizen_info_cb()
- * @see iotcon_get_tizen_info()
+ * @see iotcon_request_tizen_info()
  */
 int iotcon_tizen_info_get_property(iotcon_tizen_info_h tizen_info,
                                iotcon_tizen_info_e property, char **value);

diff --git a/lib/include/iotcon.h b/lib/include/iotcon.h
index 9096768..1312591 100644 (file)
--- a/lib/include/iotcon.h
+++ b/lib/include/iotcon.h
@@ -110,9 +110,9 @@ int iotcon_get_timeout(int *timeout_seconds);
  *
  * @pre iotcon_open() should be called to open a connection to the iotcon.
  *
- * @see iotcon_get_device_info()
- * @see iotcon_get_platform_info()
- * @see iotcon_get_tizen_info()
+ * @see iotcon_request_device_info()
+ * @see iotcon_request_platform_info()
+ * @see iotcon_request_tizen_info()
  * @see iotcon_find_resource()
  * @see iotcon_remote_resource_get()
  * @see iotcon_remote_resource_put()

diff --git a/test/iotcon-test-basic-client.c b/test/iotcon-test-basic-client.c
index 18a4d8f..d431def 100644 (file)
--- a/test/iotcon-test-basic-client.c
+++ b/test/iotcon-test-basic-client.c
@@ -251,7 +251,7 @@ static int _device_id_compare(const void *a, const void *b)
        return strcmp(a, b);
 }
 
-static void _get_tizen_info(iotcon_tizen_info_h info, int response_result,
+static void _request_tizen_info(iotcon_tizen_info_h info, int response_result,
                void *user_data)
 {
        int ret;
@@ -259,7 +259,7 @@ static void _get_tizen_info(iotcon_tizen_info_h info, int response_result,
        char *tizen_device_id = NULL;
 
        RETM_IF(IOTCON_RESPONSE_RESULT_OK != response_result,
-                       "_get_tizen_info Response error(%d)", response_result);
+                       "_request_tizen_info Response error(%d)", response_result);
 
        ret = iotcon_tizen_info_get_property(info, IOTCON_TIZEN_INFO_DEVICE_NAME,
                        &device_name);
@@ -383,10 +383,10 @@ static void _found_resource(iotcon_remote_resource_h resource, int result,
                return;
        }
 
-       /* get tizen info */
-       ret = iotcon_get_tizen_info(resource_host, connectivity_type, _get_tizen_info, NULL);
+       /* request tizen info */
+       ret = iotcon_request_tizen_info(resource_host, connectivity_type, _request_tizen_info, NULL);
        if (IOTCON_ERROR_NONE != ret) {
-               ERR("iotcon_get_tizen_info() Fail(%d)", ret);
+               ERR("iotcon_request_tizen_info() Fail(%d)", ret);
                device_id_list = g_list_remove(device_id_list, door_resource_device_id);
                free(door_resource_device_id);
                return;

diff --git a/test/iotcon-test-device-client.c b/test/iotcon-test-device-client.c
index ae0b6f9..e5c1f44 100644 (file)
--- a/test/iotcon-test-device-client.c
+++ b/test/iotcon-test-device-client.c
@@ -18,7 +18,7 @@
 #include <iotcon.h>
 #include "test.h"
 
-static void _get_device_info(iotcon_device_info_h info, int result, void *user_data)
+static void _request_device_info(iotcon_device_info_h info, int result, void *user_data)
 {
        int ret;
        char *device_name = NULL;
@@ -60,7 +60,7 @@ static void _get_device_info(iotcon_device_info_h info, int result, void *user_d
        INFO("data_model_version : %s", data_model_ver);
 }
 
-static void _get_platform_info(iotcon_platform_info_h info, int result, void *user_data)
+static void _request_platform_info(iotcon_platform_info_h info, int result, void *user_data)
 {
        int ret;
        char *platform_id = NULL;
@@ -180,18 +180,18 @@ int main()
                return -1;
        }
 
-       ret = iotcon_get_device_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_IPV4,
-                       _get_device_info, NULL);
+       ret = iotcon_request_device_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_IPV4,
+                       _request_device_info, NULL);
        if (IOTCON_ERROR_NONE != ret) {
-               ERR("iotcon_get_device_info() Fail(%d)", ret);
+               ERR("iotcon_request_device_info() Fail(%d)", ret);
                iotcon_close();
                return -1;
        }
 
-       ret = iotcon_get_platform_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_IPV4,
-                       _get_platform_info, NULL);
+       ret = iotcon_request_platform_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_IPV4,
+                       _request_platform_info, NULL);
        if (IOTCON_ERROR_NONE != ret) {
-               ERR("iotcon_get_platform_info() Fail(%d)", ret);
+               ERR("iotcon_request_platform_info() Fail(%d)", ret);
                iotcon_close();
                return -1;
        }