Added the OCStackResult code related 'RESOURCE_CHANGED' in OCToCAStackResult
authorJaehong Jo <jaehong.jo@samsung.com>
Fri, 22 Jul 2016 00:48:57 +0000 (09:48 +0900)
committerJon A. Cruz <jon@joncruz.org>
Fri, 22 Jul 2016 21:22:57 +0000 (21:22 +0000)
after merge https://gerrit.iotivity.org/gerrit/#/c/9287/

Change-Id: I5884776ce80c7550869e79b6a69c7c042f96db77
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9569
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
resource/csdk/stack/src/ocstack.c

index 5cc4c63..d3e8922 100644 (file)
@@ -702,7 +702,8 @@ CAResponseResult_t OCToCAStackResult(OCStackResult ocCode, OCMethod method)
                    // This should not happen but,
                    // give it a value just in case but output an error
                    ret = CA_CONTENT;
-                   OIC_LOG_V(ERROR, TAG, "Unexpected OC_STACK_OK return code for method [%d].", method);
+                   OIC_LOG_V(ERROR, TAG, "Unexpected OC_STACK_OK return code for method [%d].",
+                            method);
             }
             break;
         case OC_STACK_RESOURCE_CREATED:
@@ -711,6 +712,9 @@ CAResponseResult_t OCToCAStackResult(OCStackResult ocCode, OCMethod method)
         case OC_STACK_RESOURCE_DELETED:
             ret = CA_DELETED;
             break;
+        case OC_STACK_RESOURCE_CHANGED:
+            ret = CA_CHANGED;
+            break;
         case OC_STACK_INVALID_QUERY:
             ret = CA_BAD_REQ;
             break;
@@ -870,7 +874,8 @@ OCPresenceTrigger convertTriggerStringToEnum(const char * triggerStr)
 
     if (inputLength >= ENCODE_MAX_INPUT_LENGTH)
     {
-        OIC_LOG(ERROR, TAG, "encodeAddressForRFC6874 failed: Invalid input string: too long/unterminated!");
+        OIC_LOG(ERROR, TAG,
+                "encodeAddressForRFC6874 failed: Invalid input string: too long/unterminated!");
         return OC_STACK_INVALID_PARAM;
     }
 
@@ -4486,7 +4491,8 @@ void insertResourceInterface(OCResource *resource, OCResourceInterface *newInter
         }
         else
         {
-            OCStackResult result = BindResourceInterfaceToResource(resource, OC_RSRVD_INTERFACE_DEFAULT);
+            OCStackResult result = BindResourceInterfaceToResource(resource,
+                                                                    OC_RSRVD_INTERFACE_DEFAULT);
             if (result != OC_STACK_OK)
             {
                 OICFree(newInterface->name);