Fix type error (IOTCON_RESPONSE_RESULT_DELETED)
authorsung.goo.kim <sung.goo.kim@samsung.com>
Wed, 6 Jan 2016 02:46:57 +0000 (11:46 +0900)
committerYoungjae Shin <yj99.shin@samsung.com>
Wed, 6 Jan 2016 08:14:51 +0000 (17:14 +0900)
Change-Id: I3714bfafd91357883673d37a9ab58c4db5ac4f1b

daemon/icd-ioty-ocprocess.c
lib/include/iotcon-constant.h
test/iotcon-test-basic-client.c
test/iotcon-test-basic-server.c

index e992a3e..a82da84 100644 (file)
@@ -587,7 +587,7 @@ static int _ocprocess_parse_oic_result(OCStackResult result)
                res = IOTCON_RESPONSE_RESOURCE_CREATED;
                break;
        case OC_STACK_RESOURCE_DELETED:
-               res = IOTCON_RESPONSE_RESULT_DELETED;
+               res = IOTCON_RESPONSE_RESOURCE_DELETED;
                break;
        case OC_STACK_UNAUTHORIZED_REQ:
                res = IOTCON_RESPONSE_FORBIDDEN;
index 479a73d..99413c6 100644 (file)
@@ -133,7 +133,7 @@ typedef enum {
        IOTCON_RESPONSE_OK = 0, /**< Indicates result of response for success */
        IOTCON_RESPONSE_ERROR, /**< Indicates result of response for something error */
        IOTCON_RESPONSE_RESOURCE_CREATED, /**< Indicates result of response for resource has created */
-       IOTCON_RESPONSE_RESULT_DELETED, /**< Indicates result of response for resource has deleted */
+       IOTCON_RESPONSE_RESOURCE_DELETED, /**< Indicates result of response for resource has deleted */
        IOTCON_RESPONSE_SLOW, /**< Indicates result of response for slow resource */
        IOTCON_RESPONSE_FORBIDDEN, /**< Indicates result of response for accessing unauthorized resource */
 } iotcon_response_result_e;
index 21369be..dd62e46 100644 (file)
@@ -99,7 +99,7 @@ static void _on_response_delete(iotcon_remote_resource_h resource,
        }
 
        if (IOTCON_RESPONSE_OK != response_result
-                       && IOTCON_RESPONSE_RESULT_DELETED != response_result) {
+                       && IOTCON_RESPONSE_RESOURCE_DELETED != response_result) {
                ERR("_on_response_delete Response error(%d)", response_result);
                return;
        }
index 21d63f2..69aa4b2 100644 (file)
@@ -416,7 +416,7 @@ static int _request_handler_delete(iotcon_resource_h resource, iotcon_request_h
                return -1;
        }
 
-       ret = _send_response(request, NULL, IOTCON_RESPONSE_RESULT_DELETED);
+       ret = _send_response(request, NULL, IOTCON_RESPONSE_RESOURCE_DELETED);
        if (0 != ret) {
                ERR("_send_response() Fail(%d)", ret);
                return -1;