Apply comments about parameter type (integer -> enum)

Change-Id: Ie9fcc441d81b40e7ecd2b7ddaa7d1ceb295a013d

diff --git a/lib/icl-list.c b/lib/icl-list.c
index 8712faa..2c05ff5 100644 (file)
--- a/lib/icl-list.c
+++ b/lib/icl-list.c
@@ -412,7 +412,7 @@ API int iotcon_list_remove_nth(iotcon_list_h list, int pos)
        return ret;
 }
 
-API int iotcon_list_get_type(iotcon_list_h list, int *type)
+API int iotcon_list_get_type(iotcon_list_h list, iotcon_types_e *type)
 {
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == type, IOTCON_ERROR_INVALID_PARAMETER);

diff --git a/lib/icl-presence.c b/lib/icl-presence.c
index 70d2830..1e1c6a8 100644 (file)
--- a/lib/icl-presence.c
+++ b/lib/icl-presence.c
@@ -290,7 +290,7 @@ API int iotcon_presence_get_host_address(iotcon_presence_h presence, char **host
 
 
 API int iotcon_presence_get_connectivity_type(iotcon_presence_h presence,
-               int *connectivity_type)
+               iotcon_connectivity_type_e *connectivity_type)
 {
        RETV_IF(NULL == presence, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == connectivity_type, IOTCON_ERROR_INVALID_PARAMETER);
@@ -326,7 +326,7 @@ API int iotcon_presence_response_get_host_address(iotcon_presence_response_h res
 
 
 API int iotcon_presence_response_get_connectivity_type(
-               iotcon_presence_response_h response, int *connectivity_type)
+               iotcon_presence_response_h response, iotcon_connectivity_type_e *connectivity_type)
 {
        RETV_IF(NULL == response, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == connectivity_type, IOTCON_ERROR_INVALID_PARAMETER);
@@ -350,7 +350,7 @@ API int iotcon_presence_response_get_resource_type(iotcon_presence_response_h re
 
 
 API int iotcon_presence_response_get_result(iotcon_presence_response_h response,
-               int *result)
+               iotcon_presence_result_e *result)
 {
        RETV_IF(NULL == response, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == result, IOTCON_ERROR_INVALID_PARAMETER);
@@ -362,7 +362,7 @@ API int iotcon_presence_response_get_result(iotcon_presence_response_h response,
 
 
 API int iotcon_presence_response_get_trigger(iotcon_presence_response_h response,
-               int *trigger)
+               iotcon_presence_trigger_e *trigger)
 {
        RETV_IF(NULL == response, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == trigger, IOTCON_ERROR_INVALID_PARAMETER);

diff --git a/lib/icl-query.c b/lib/icl-query.c
index ac0b7f7..709a2ab 100644 (file)
--- a/lib/icl-query.c
+++ b/lib/icl-query.c
@@ -88,7 +88,7 @@ API int iotcon_query_get_resource_types(iotcon_query_h query,
        return IOTCON_ERROR_NONE;
 }
 
-API int iotcon_query_get_interface(iotcon_query_h query, int *iface)
+API int iotcon_query_get_interface(iotcon_query_h query, iotcon_interface_e *iface)
 {
        char *iface_str = NULL;
 

diff --git a/lib/icl-remote-resource-caching.c b/lib/icl-remote-resource-caching.c
index 3962c8a..b8323ee 100644 (file)
--- a/lib/icl-remote-resource-caching.c
+++ b/lib/icl-remote-resource-caching.c
@@ -198,7 +198,7 @@ static void _caching_get_cb(iotcon_remote_resource_h resource,
                void *user_data)
 {
        int ret;
-       int result;
+       iotcon_response_result_e result;
        iotcon_representation_h repr = NULL;
        iotcon_representation_h cloned_repr;
 

diff --git a/lib/icl-remote-resource-monitoring.c b/lib/icl-remote-resource-monitoring.c
index 548fb03..579c1e0 100644 (file)
--- a/lib/icl-remote-resource-monitoring.c
+++ b/lib/icl-remote-resource-monitoring.c
@@ -28,7 +28,7 @@ static void _monitoring_get_cb(iotcon_remote_resource_h resource,
                void *user_data)
 {
        int ret;
-       int response_result;
+       iotcon_response_result_e response_result;
        iotcon_remote_resource_state_e resource_state;
 
        RET_IF(NULL == resource);
@@ -75,8 +75,10 @@ static gboolean _monitoring_get_timer(gpointer user_data)
 static void _monitoring_presence_cb(iotcon_presence_h presence, iotcon_error_e err,
                iotcon_presence_response_h response, void *user_data)
 {
-       int ret, result, trigger;
+       int ret;
        unsigned int get_timer_id;
+       iotcon_presence_trigger_e trigger;
+       iotcon_presence_result_e result;
        iotcon_remote_resource_h resource = user_data;
 
        RET_IF(NULL == resource);
@@ -115,7 +117,8 @@ API int iotcon_remote_resource_start_monitoring(iotcon_remote_resource_h resourc
                void *user_data)
 {
        char *host_address;
-       int ret, connectivity_type;
+       int ret;
+       iotcon_connectivity_type_e connectivity_type;
        unsigned int get_timer_id;
 
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);

diff --git a/lib/icl-remote-resource.c b/lib/icl-remote-resource.c
index ace611c..57f5ad1 100644 (file)
--- a/lib/icl-remote-resource.c
+++ b/lib/icl-remote-resource.c
@@ -321,7 +321,7 @@ API int iotcon_remote_resource_get_host_address(iotcon_remote_resource_h resourc
 
 /* The content of the resource should not be freed by user. */
 API int iotcon_remote_resource_get_connectivity_type(iotcon_remote_resource_h resource,
-               int *connectivity_type)
+               iotcon_connectivity_type_e *connectivity_type)
 {
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == connectivity_type, IOTCON_ERROR_INVALID_PARAMETER);

diff --git a/lib/icl-request.c b/lib/icl-request.c
index ca95f54..44fe1fd 100644 (file)
--- a/lib/icl-request.c
+++ b/lib/icl-request.c
@@ -31,7 +31,7 @@ API int iotcon_request_get_host_address(iotcon_request_h request,
 
 
 API int iotcon_request_get_connectivity_type(iotcon_request_h request,
-               int *connectivity_type)
+               iotcon_connectivity_type_e *connectivity_type)
 {
        RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == connectivity_type, IOTCON_ERROR_INVALID_PARAMETER);
@@ -90,7 +90,8 @@ 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, int *action)
+API int iotcon_request_get_observer_action(iotcon_request_h request,
+               iotcon_observe_action_e *action)
 {
        RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == action, IOTCON_ERROR_INVALID_PARAMETER);

diff --git a/lib/icl-response.c b/lib/icl-response.c
index d7e1429..e17db38 100644 (file)
--- a/lib/icl-response.c
+++ b/lib/icl-response.c
@@ -88,7 +88,8 @@ API int iotcon_response_get_representation(iotcon_response_h resp,
 
 }
 
-API int iotcon_response_get_result(iotcon_response_h resp, int *result)
+API int iotcon_response_get_result(iotcon_response_h resp,
+               iotcon_response_result_e *result)
 {
        RETV_IF(NULL == resp, IOTCON_ERROR_INVALID_PARAMETER);
 

diff --git a/lib/icl-state.c b/lib/icl-state.c
index cbaa960..dec8867 100644 (file)
--- a/lib/icl-state.c
+++ b/lib/icl-state.c
@@ -423,7 +423,8 @@ API int iotcon_state_set_state(iotcon_state_h state, const char *key, iotcon_sta
        return IOTCON_ERROR_NONE;
 }
 
-API int iotcon_state_get_type(iotcon_state_h state, const char *key, int *type)
+API int iotcon_state_get_type(iotcon_state_h state, const char *key,
+               iotcon_types_e *type)
 {
        iotcon_value_h value = NULL;
 

diff --git a/lib/include/iotcon-client.h b/lib/include/iotcon-client.h
index b12a692..ac3d709 100644 (file)
--- a/lib/include/iotcon-client.h
+++ b/lib/include/iotcon-client.h
@@ -168,7 +168,7 @@ int iotcon_presence_get_host_address(iotcon_presence_h presence, char **host_add
  * @see iotcon_presence_get_resource_type()
  */
 int iotcon_presence_get_connectivity_type(iotcon_presence_h presence,
-               int *connectivity_type);
+               iotcon_connectivity_type_e *connectivity_type);
 
 /**
  * @brief Gets resource type from the presence handle
@@ -208,7 +208,8 @@ int iotcon_presence_get_resource_type(iotcon_presence_h presence,
  * @see iotcon_presence_response_get_connectivity_type()
  * @see iotcon_presence_response_get_resource_type()
  */
-int iotcon_presence_response_get_result(iotcon_presence_response_h response, int *result);
+int iotcon_presence_response_get_result(iotcon_presence_response_h response,
+               iotcon_presence_result_e *result);
 
 /**
  * @brief Gets trigger from the presence response handle
@@ -230,7 +231,7 @@ int iotcon_presence_response_get_result(iotcon_presence_response_h response, int
  * @see iotcon_presence_response_get_resource_type()
  */
 int iotcon_presence_response_get_trigger(iotcon_presence_response_h response,
-               int *trigger);
+               iotcon_presence_trigger_e *trigger);
 
 /**
  * @brief Gets host address from the presence response handle
@@ -273,7 +274,7 @@ int iotcon_presence_response_get_host_address(iotcon_presence_response_h respons
  * @see iotcon_presence_response_get_resource_type()
  */
 int iotcon_presence_response_get_connectivity_type(iotcon_presence_response_h response,
-               int *connectivity_type);
+               iotcon_connectivity_type_e *connectivity_type);
 
 /**
  * @brief Gets resource type from the presence response handle

diff --git a/lib/include/iotcon-list.h b/lib/include/iotcon-list.h
index bf1c4d7..1d456c8 100644 (file)
--- a/lib/include/iotcon-list.h
+++ b/lib/include/iotcon-list.h
@@ -324,7 +324,7 @@ int iotcon_list_remove_nth(iotcon_list_h list, int pos);
  * @retval #IOTCON_ERROR_NONE  Successful
  * @retval #IOTCON_ERROR_INVALID_PARAMETER  Invalid parameter
  */
-int iotcon_list_get_type(iotcon_list_h list, int *type);
+int iotcon_list_get_type(iotcon_list_h list, iotcon_types_e *type);
 
 /**
  * @brief Gets the number of elements in a list.

diff --git a/lib/include/iotcon-query.h b/lib/include/iotcon-query.h
index 9bcdc68..a242ae8 100644 (file)
--- a/lib/include/iotcon-query.h
+++ b/lib/include/iotcon-query.h
@@ -117,7 +117,7 @@ int iotcon_query_get_resource_types(iotcon_query_h query, iotcon_resource_types_
  * @see iotcon_query_remove()
  * @see iotcon_query_set_interface()
  */
-int iotcon_query_get_interface(iotcon_query_h query, int *iface);
+int iotcon_query_get_interface(iotcon_query_h query, iotcon_interface_e *iface);
 
 /**
  * @brief Sets the resource types into the query.

diff --git a/lib/include/iotcon-remote-resource.h b/lib/include/iotcon-remote-resource.h
index c102408..0bf4144 100644 (file)
--- a/lib/include/iotcon-remote-resource.h
+++ b/lib/include/iotcon-remote-resource.h
@@ -514,7 +514,7 @@ int iotcon_remote_resource_get_uri_path(iotcon_remote_resource_h resource,
  * @see iotcon_remote_resource_set_options()
  */
 int iotcon_remote_resource_get_connectivity_type(iotcon_remote_resource_h resource,
-               int *connectivity_type);
+               iotcon_connectivity_type_e *connectivity_type);
 
 /**
  * @brief Gets an host address of the remote resource

diff --git a/lib/include/iotcon-request.h b/lib/include/iotcon-request.h
index 106ae15..a3d857e 100644 (file)
--- a/lib/include/iotcon-request.h
+++ b/lib/include/iotcon-request.h
@@ -80,7 +80,7 @@ int iotcon_request_get_host_address(iotcon_request_h request,
  * @see iotcon_request_get_observer_id()
  */
 int iotcon_request_get_connectivity_type(iotcon_request_h request,
-               int *connectivity_type);
+               iotcon_connectivity_type_e *connectivity_type);
 
 /**
  * @brief Gets an representation of the request
@@ -198,7 +198,8 @@ int iotcon_request_get_query(iotcon_request_h request, iotcon_query_h *query);
  * @see iotcon_request_get_query()
  * @see iotcon_request_get_observer_id()
  */
-int iotcon_request_get_observer_action(iotcon_request_h request, int *action);
+int iotcon_request_get_observer_action(iotcon_request_h request,
+               iotcon_observe_action_e *action);
 
 /**
  * @brief Gets observation id of the request

diff --git a/lib/include/iotcon-response.h b/lib/include/iotcon-response.h
index 712013a..1eda241 100644 (file)
--- a/lib/include/iotcon-response.h
+++ b/lib/include/iotcon-response.h
@@ -123,7 +123,8 @@ int iotcon_response_get_representation(iotcon_response_h resp, iotcon_representa
  * @see iotcon_response_get_options()
  * @see iotcon_response_get_representation()
  */
-int iotcon_response_get_result(iotcon_response_h resp, int *result);
+int iotcon_response_get_result(iotcon_response_h resp,
+               iotcon_response_result_e *result);
 
 
 /**

diff --git a/lib/include/iotcon-state.h b/lib/include/iotcon-state.h
index 164f80a..cc26052 100644 (file)
--- a/lib/include/iotcon-state.h
+++ b/lib/include/iotcon-state.h
@@ -340,7 +340,8 @@ int iotcon_state_unset(iotcon_state_h state, const char *key);
  * @retval #IOTCON_ERROR_INVALID_PARAMETER  Invalid parameter
  * @retval #IOTCON_ERROR_NO_DATA  No data available
  */
-int iotcon_state_get_type(iotcon_state_h state, const char *key, int *type);
+int iotcon_state_get_type(iotcon_state_h state, const char *key,
+               iotcon_types_e *type);
 
 /**
  * @brief Specifies the type of function passed to iotcon_state_foreach()

diff --git a/test/iotcon-test-basic-client.c b/test/iotcon-test-basic-client.c
index c421ba0..353b87b 100644 (file)
--- a/test/iotcon-test-basic-client.c
+++ b/test/iotcon-test-basic-client.c
@@ -46,7 +46,8 @@ static void _on_resopnse_observe(iotcon_remote_resource_h resource, iotcon_respo
 static void _on_response_delete(iotcon_remote_resource_h resource, iotcon_response_h response,
                void *user_data)
 {
-       int ret, response_result;
+       int ret;
+       iotcon_response_result_e response_result;
        iotcon_remote_resource_h door_resource = user_data;
 
        ret = iotcon_response_get_result(response, &response_result);
@@ -77,7 +78,9 @@ static void _on_resopnse_post(iotcon_remote_resource_h resource, iotcon_response
 {
        iotcon_state_h recv_state;
        char *host, *created_uri_path;
-       int ret, connectivity_type, response_result, ifaces = 0;
+       int ret, ifaces = 0;
+       iotcon_connectivity_type_e connectivity_type;
+       iotcon_response_result_e response_result;
        iotcon_resource_types_h types = NULL;
        iotcon_remote_resource_h new_door_resource, door_resource;
        iotcon_representation_h recv_repr = NULL;
@@ -167,7 +170,7 @@ static void _on_response_put(iotcon_remote_resource_h resource, iotcon_response_
                void *user_data)
 {
        int ret;
-       int response_result;
+       iotcon_response_result_e response_result;
        iotcon_representation_h send_repr;
 
        ret = iotcon_response_get_result(response, &response_result);
@@ -200,8 +203,8 @@ static void _on_response_get(iotcon_remote_resource_h resource,
                iotcon_response_h response, void *user_data)
 {
        int ret;
-       int response_result;
        bool opened = true;
+       iotcon_response_result_e response_result;
        iotcon_representation_h send_repr;
        iotcon_representation_h recv_repr;
        iotcon_state_h send_state;
@@ -294,7 +297,10 @@ static void _presence_handler(iotcon_presence_h presence, iotcon_error_e err,
 {
        char *host_address;
        char *resource_type;
-       int ret, connectivity_type, result, trigger;
+       int ret;
+       iotcon_presence_result_e result;
+       iotcon_presence_trigger_e trigger;
+       iotcon_connectivity_type_e connectivity_type;
 
        RETM_IF(IOTCON_ERROR_NONE != err, "_presence_handler error(%d)", err);
 
@@ -409,7 +415,8 @@ static void _found_resource(iotcon_remote_resource_h resource, iotcon_error_e re
        char *resource_device_id;
        iotcon_presence_h presence_handle;
        iotcon_resource_types_h resource_types;
-       int ret, resource_interfaces, connectivity_type;
+       int ret, resource_interfaces;
+       iotcon_connectivity_type_e connectivity_type;
        iotcon_remote_resource_h resource_clone = NULL;
 
        RETM_IF(IOTCON_ERROR_NONE != result, "Invalid result(%d)", result);

diff --git a/test/iotcon-test-basic-server.c b/test/iotcon-test-basic-server.c
index c373550..4806f93 100644 (file)
--- a/test/iotcon-test-basic-server.c
+++ b/test/iotcon-test-basic-server.c
@@ -422,7 +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, observer_action;
+       int ret, types, observer_id;
+       iotcon_observe_action_e observer_action;
        char *host_address;
 
        RET_IF(NULL == request);

diff --git a/test/iotcon-test-repr-client.c b/test/iotcon-test-repr-client.c
index 7323f39..3588b9f 100644 (file)
--- a/test/iotcon-test-repr-client.c
+++ b/test/iotcon-test-repr-client.c
@@ -167,7 +167,7 @@ static void _on_get_2nd(iotcon_remote_resource_h resource,
                void *user_data)
 {
        int ret;
-       int response_result;
+       iotcon_response_result_e response_result;
        iotcon_representation_h recv_repr = NULL;
 
        RETM_IF(IOTCON_ERROR_NONE != err, "Invalid err(%d)", err);
@@ -199,7 +199,7 @@ static void _on_response_1st(iotcon_remote_resource_h resource,
                void *user_data)
 {
        int ret;
-       int response_result;
+       iotcon_response_result_e response_result;
        iotcon_query_h query_params;
        iotcon_representation_h recv_repr = NULL;