Modify API Name (get_device/platform_info -> find_...)

Change-Id: I87fe6f1625343e5d674c7cc45a0b3f7de96b2b17

diff --git a/lib/icl-device.c b/lib/icl-device.c
index b8fc8f70f9f14e196b1e9f20a14621c7d8ab53ed..c91b59548ca6565dd963b29c0a79dce63af1ffa2 100644 (file)
--- a/lib/icl-device.c
+++ b/lib/icl-device.c
@@ -52,7 +52,7 @@ API int iotcon_device_info_get_property(iotcon_device_info_h device_info,
        return IOTCON_ERROR_NONE;
 }
 
-API int iotcon_get_device_info(const char *host_address,
+API int iotcon_find_device_info(const char *host_address,
                iotcon_connectivity_type_e connectivity_type,
                iotcon_device_info_cb cb,
                void *user_data)
@@ -67,9 +67,9 @@ API int iotcon_get_device_info(const char *host_address,
        case IOTCON_CONNECTIVITY_IPV4:
        case IOTCON_CONNECTIVITY_IPV6:
        case IOTCON_CONNECTIVITY_ALL:
-               ret = icl_ioty_get_device_info(host_address, connectivity_type, cb, user_data);
+               ret = icl_ioty_find_device_info(host_address, connectivity_type, cb, user_data);
                if (IOTCON_ERROR_NONE != ret) {
-                       ERR("icl_ioty_get_device_info() Fail(%d)", ret);
+                       ERR("icl_ioty_find_device_info() Fail(%d)", ret);
                        return ret;
                }
                break;
@@ -130,7 +130,7 @@ API int iotcon_platform_info_get_property(iotcon_platform_info_h platform_info,
        return IOTCON_ERROR_NONE;
 }
 
-API int iotcon_get_platform_info(const char *host_address,
+API int iotcon_find_platform_info(const char *host_address,
                iotcon_connectivity_type_e connectivity_type,
                iotcon_platform_info_cb cb,
                void *user_data)
@@ -145,9 +145,9 @@ API int iotcon_get_platform_info(const char *host_address,
        case IOTCON_CONNECTIVITY_IPV4:
        case IOTCON_CONNECTIVITY_IPV6:
        case IOTCON_CONNECTIVITY_ALL:
-               ret = icl_ioty_get_platform_info(host_address, connectivity_type, cb, user_data);
+               ret = icl_ioty_find_platform_info(host_address, connectivity_type, cb, user_data);
                if (IOTCON_ERROR_NONE != ret) {
-                       ERR("icl_ioty_get_platform_info() Fail(%d)", ret);
+                       ERR("icl_ioty_find_platform_info() Fail(%d)", ret);
                        return ret;
                }
                break;

diff --git a/lib/icl-ioty.c b/lib/icl-ioty.c
index 78324f4a480c8bfc0e79af33de961efda0b2edf7..2ccca965ee4774acb6b038a23cb0cac41f760bde 100644 (file)
--- a/lib/icl-ioty.c
+++ b/lib/icl-ioty.c
@@ -223,7 +223,7 @@ int icl_ioty_find_resource(const char *host_address,
        return IOTCON_ERROR_NONE;
 }
 
-int icl_ioty_get_device_info(const char *host_address,
+int icl_ioty_find_device_info(const char *host_address,
                iotcon_connectivity_type_e connectivity_type,
                iotcon_device_info_cb cb,
                void *user_data)
@@ -277,7 +277,7 @@ int icl_ioty_get_device_info(const char *host_address,
        return IOTCON_ERROR_NONE;
 }
 
-int icl_ioty_get_platform_info(const char *host_address,
+int icl_ioty_find_platform_info(const char *host_address,
                iotcon_connectivity_type_e connectivity_type,
                iotcon_platform_info_cb cb,
                void *user_data)

diff --git a/lib/icl-ioty.h b/lib/icl-ioty.h
index de03683e8a8638a3647cb2038385c3ff6ee7e6cc..c76a897bc85ae7dbcefdc6a9c17029a0733d3a04 100644 (file)
--- a/lib/icl-ioty.h
+++ b/lib/icl-ioty.h
@@ -52,11 +52,11 @@ int icl_ioty_find_resource(const char *host_address,
                bool is_secure,
                iotcon_found_resource_cb cb,
                void *user_data);
-int icl_ioty_get_device_info(const char *host_address,
+int icl_ioty_find_device_info(const char *host_address,
                iotcon_connectivity_type_e connectivity_type,
                iotcon_device_info_cb cb,
                void *user_data);
-int icl_ioty_get_platform_info(const char *host_address,
+int icl_ioty_find_platform_info(const char *host_address,
                iotcon_connectivity_type_e connectivity_type,
                iotcon_platform_info_cb cb,
                void *user_data);

diff --git a/lib/include/iotcon-client.h b/lib/include/iotcon-client.h
index af084790025314fda7df8076e8d05c3b191d4ff2..838d1b9e3e90ded9bd38d7879eae199382852ffd 100644 (file)
--- a/lib/include/iotcon-client.h
+++ b/lib/include/iotcon-client.h
@@ -386,7 +386,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_find_device_info().
  * @details The @a result could be one of #iotcon_error_e.
  *
  * @since_tizen 3.0
@@ -395,16 +395,16 @@ 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_find_device_info() will invoke this callback function.
  *
- * @see iotcon_get_device_info()
+ * @see iotcon_find_device_info()
  * @see iotcon_device_info_get_property()
  */
 typedef void (*iotcon_device_info_cb)(iotcon_device_info_h device_info,
                iotcon_error_e result, void *user_data);
 
 /**
- * @brief Gets the device information of remote server, asynchronously.
+ * @brief Finds the device information of remote server, asynchronously.
  * @details Request device information to server and pass the information by calling
  * iotcon_device_info_cb().\n
  * @a host_address could be #IOTCON_MULTICAST_ADDRESS for multicast.\n
@@ -435,7 +435,7 @@ typedef void (*iotcon_device_info_cb)(iotcon_device_info_h device_info,
  * @see iotcon_device_info_get_property()
  * @see iotcon_set_timeout()
  */
-int iotcon_get_device_info(const char *host_address,
+int iotcon_find_device_info(const char *host_address,
                iotcon_connectivity_type_e connectivity_type,
                iotcon_device_info_cb cb,
                void *user_data);
@@ -457,13 +457,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_find_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_find_platform_info().
  * @details The @a result could be one of #iotcon_error_e.
  *
  * @since_tizen 3.0
@@ -472,16 +472,16 @@ 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_find_platform_info() will invoke this callback function.
  *
- * @see iotcon_get_platform_info()
+ * @see iotcon_find_platform_info()
  * @see iotcon_platform_info_get_property()
  */
 typedef void (*iotcon_platform_info_cb)(iotcon_platform_info_h platform_info,
                iotcon_error_e result, void *user_data);
 
 /**
- * @brief Gets the platform information of remote server, asynchronously.
+ * @brief Finds the platform information of remote server, asynchronously.
  * @details Request platform information to server and pass the information by calling
  * iotcon_platform_info_cb().\n
  * @a host_address could be #IOTCON_MULTICAST_ADDRESS for multicast.\n
@@ -514,7 +514,7 @@ typedef void (*iotcon_platform_info_cb)(iotcon_platform_info_h platform_info,
  * @see iotcon_platform_info_get_property()
  * @see iotcon_set_timeout()
  */
-int iotcon_get_platform_info(const char *host_address,
+int iotcon_find_platform_info(const char *host_address,
                iotcon_connectivity_type_e connectivity_type,
                iotcon_platform_info_cb cb,
                void *user_data);
@@ -536,7 +536,7 @@ 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_find_platform_info()
  */
 int iotcon_platform_info_get_property(iotcon_platform_info_h platform_info,
                iotcon_platform_info_e property, char **value);

diff --git a/lib/include/iotcon.h b/lib/include/iotcon.h
index 07e4e2e15d4a59f7265a00f5a2dabb876dec9568..9250b3a1c6b038694266c23acf842aa0746761d3 100644 (file)
--- a/lib/include/iotcon.h
+++ b/lib/include/iotcon.h
@@ -49,7 +49,7 @@ extern "C" {
  */
 
 /**
- * @brief Connects to the iotcon service.
+ * @brief Initializes to the iotcon service.
  * @details Call this function to start IoTCon.
  *
  * @since_tizen 3.0
@@ -69,7 +69,7 @@ extern "C" {
 int iotcon_initialize();
 
 /**
- * @brief Disconnects from the iotcon service.
+ * @brief Deinitializes from the iotcon service.
  * @details Frees the resources allocated to IoTCon.
  *
  * @since_tizen 3.0
@@ -84,8 +84,8 @@ void iotcon_deinitialize(void);
 
 /**
  * @brief Gets the timeout seconds of asynchronous API.
- * @details This API get the timeout of iotcon_get_device_info(),
- * iotcon_get_platform_info(), iotcon_find_resource(),
+ * @details This API get the timeout of iotcon_find_device_info(),
+ * iotcon_find_platform_info(), iotcon_find_resource(),
  * iotcon_remote_resource_get(), iotcon_remote_resource_put(),
  * iotcon_remote_resource_post() and iotcon_remote_resource_delete().
  *
@@ -106,8 +106,8 @@ int iotcon_get_timeout(int *timeout_seconds);
 
 /**
  * @brief Sets the timeout seconds of asynchronous APIs.
- * @details This API set the timeout of iotcon_get_device_info(),
- * iotcon_get_platform_info(), iotcon_find_resource(),
+ * @details This API set the timeout of iotcon_find_device_info(),
+ * iotcon_find_platform_info(), iotcon_find_resource(),
  * iotcon_remote_resource_get(), iotcon_remote_resource_put(),
  * iotcon_remote_resource_post() and iotcon_remote_resource_delete().\n
  * Default timeout interval value is 30.

diff --git a/test/iotcon-test-device-client.c b/test/iotcon-test-device-client.c
index aca6409e7f59a81be97fe1497abed89415f88ebb..b55c28f8826695567c78b1246deea8971abda0fb 100644 (file)
--- a/test/iotcon-test-device-client.c
+++ b/test/iotcon-test-device-client.c
@@ -183,18 +183,18 @@ int main(int argc, char **argv)
                return -1;
        }
 
-       ret = iotcon_get_device_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_ALL,
+       ret = iotcon_find_device_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_ALL,
                        _request_device_info, NULL);
        if (IOTCON_ERROR_NONE != ret) {
-               ERR("iotcon_get_device_info() Fail(%d)", ret);
+               ERR("iotcon_find_device_info() Fail(%d)", ret);
                iotcon_deinitialize();
                return -1;
        }
 
-       ret = iotcon_get_platform_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_ALL,
+       ret = iotcon_find_platform_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_ALL,
                        _request_platform_info, NULL);
        if (IOTCON_ERROR_NONE != ret) {
-               ERR("iotcon_get_platform_info() Fail(%d)", ret);
+               ERR("iotcon_find_platform_info() Fail(%d)", ret);
                iotcon_deinitialize();
                return -1;
        }