modify Lite resource (put -> post)

Change-Id: Ifbf232f3ef49c5475e585f417f77e8eef963dc77
Signed-off-by: youngman <yman.jung@samsung.com>

diff --git a/common/ic-utils.c b/common/ic-utils.c
index 309e5edcc609e54996354fc6d193873b513e6a8a..1f0cedcc7e796abd88e061708dbba2794e7e1d08 100644 (file)
--- a/common/ic-utils.c
+++ b/common/ic-utils.c
@@ -24,8 +24,9 @@
 #include "ic-log.h"
 #include "ic-utils.h"
 
-
+#ifdef TZ_VER_3
 static int _ic_oic_feature_supported = -1;
+#endif
 
 char* ic_utils_strdup(const char *src)
 {

diff --git a/lib/icl-lite-resource.c b/lib/icl-lite-resource.c
index 8f211ed85805e8dfb57abfac875ac474dfe2bab8..e534d22adb9c08c073bae743b9e04d0fb9dfe2a8 100644 (file)
--- a/lib/icl-lite-resource.c
+++ b/lib/icl-lite-resource.c
@@ -39,7 +39,7 @@ struct icl_lite_resource {
        int64_t handle;
        unsigned int sub_id;
        int properties;
-       iotcon_lite_resource_put_request_cb cb;
+       iotcon_lite_resource_post_request_cb cb;
        void *cb_data;
 };
 
@@ -185,7 +185,7 @@ static void _icl_lite_resource_request_handler(GDBusConnection *connection,
        switch (request_type) {
        case IOTCON_REQUEST_GET:
                break;
-       case IOTCON_REQUEST_PUT:
+       case IOTCON_REQUEST_POST:
                if (FALSE == g_variant_iter_loop(repr_iter, "v", &repr_gvar)) {
                        ERR("Received representation is empty.");
                        _icl_lite_resource_response_send(repr, oic_request_h, oic_resource_h,
@@ -230,10 +230,10 @@ static void _icl_lite_resource_request_handler(GDBusConnection *connection,
 
                iotcon_state_destroy(recv_state);
                break;
-       case IOTCON_REQUEST_POST:
+       case IOTCON_REQUEST_PUT:
        case IOTCON_REQUEST_DELETE:
        default:
-               WARN("Not supported request (only GET / PUT / OBSERVE)");
+               WARN("Not supported request (only GET / POST / OBSERVE)");
                ret = _icl_lite_resource_response_send(repr, oic_request_h, oic_resource_h,
                                IOTCON_RESPONSE_FORBIDDEN);
                if (IOTCON_ERROR_NONE != ret)
@@ -259,7 +259,7 @@ static void _icl_lite_resource_request_handler(GDBusConnection *connection,
                return;
        }
 
-       if (IOTCON_REQUEST_PUT == request_type) {
+       if (IOTCON_REQUEST_POST == request_type) {
                ret = _icl_lite_resource_notify(resource);
                if (IOTCON_ERROR_NONE != ret)
                        WARN("_icl_lite_resource_notify() Fail(%d)", ret);
@@ -289,7 +289,7 @@ API int iotcon_lite_resource_create(const char *uri_path,
                iotcon_resource_types_h res_types,
                int properties,
                iotcon_state_h state,
-               iotcon_lite_resource_put_request_cb cb,
+               iotcon_lite_resource_post_request_cb cb,
                void *user_data,
                iotcon_lite_resource_h *resource_handle)
 {

diff --git a/lib/include/iotcon-lite-resource.h b/lib/include/iotcon-lite-resource.h
index 0a5bc9c6bf1dd6ec773e4b4c20b00f7ae75d860d..fa21119c09adad8e6ac4af8729b64a26584bb87d 100644 (file)
--- a/lib/include/iotcon-lite-resource.h
+++ b/lib/include/iotcon-lite-resource.h
@@ -157,11 +157,11 @@ static void _update_brightness(int brightness)
  *
  * @pre The callback must be registered using iotcon_lite_resource_create()
  *
- * @return true to accept put request, otherwise false to reject it.
+ * @return true to accept post request, otherwise false to reject it.
  *
  * @see iotcon_lite_resource_create()
  */
-typedef bool (*iotcon_lite_resource_put_request_cb)(iotcon_lite_resource_h resource,
+typedef bool (*iotcon_lite_resource_post_request_cb)(iotcon_lite_resource_h resource,
                iotcon_state_h state, void *user_data);
 
 
@@ -205,7 +205,7 @@ int iotcon_lite_resource_create(const char *uri_path,
                iotcon_resource_types_h res_types,
                int properties,
                iotcon_state_h state,
-               iotcon_lite_resource_put_request_cb cb,
+               iotcon_lite_resource_post_request_cb cb,
                void *user_data,
                iotcon_lite_resource_h *resource_handle);