[IOT-1460] Remove cbor.h dependency

Patch removes cbor.h by removing it from ocpayload.h. It is now moved
to ocpayloadcbor.h.

https://jira.iotivity.org/browse/IOT-1460

Change-Id: I23ae035804840a327e2764ed64559b82247ab8e8
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13759
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

diff --git a/resource/csdk/security/src/amaclresource.c b/resource/csdk/security/src/amaclresource.c
index d29187f47e292d2c0ce71b8cd4814ce911c33d28..8c8a35baaa8a804fa85a5f0224f93e1a50619cd6 100644 (file)
--- a/resource/csdk/security/src/amaclresource.c
+++ b/resource/csdk/security/src/amaclresource.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include "oic_malloc.h"
 #include "ocpayload.h"
+#include "ocpayloadcbor.h"
 #include "payload_logging.h"
 #include "psinterface.h"
 #include "resourcemanager.h"

diff --git a/resource/csdk/security/src/credresource.c b/resource/csdk/security/src/credresource.c
index 9819887a494646374c94031940e6c60943a844d7..c093b41be238ee52b14c9df80e057a4d80c56430 100644 (file)
--- a/resource/csdk/security/src/credresource.c
+++ b/resource/csdk/security/src/credresource.c
@@ -39,6 +39,7 @@
 #include "ocserverrequest.h"
 #include "oic_malloc.h"
 #include "ocpayload.h"
+#include "ocpayloadcbor.h"
 #include "utlist.h"
 #include "credresource.h"
 #include "doxmresource.h"

diff --git a/resource/csdk/security/src/crlresource.c b/resource/csdk/security/src/crlresource.c
index e73038fb18b1b9204785a56afd6542eceedcc5aa..33021aee0135ed4cf97088351ea37bd49dd60658 100644 (file)
--- a/resource/csdk/security/src/crlresource.c
+++ b/resource/csdk/security/src/crlresource.c
@@ -26,6 +26,7 @@
 #include "srmutility.h"
 #include "doxmresource.h"
 #include "ocpayload.h"
+#include "ocpayloadcbor.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "crlresource.h"

diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c
index fdcb7dec990d4489579149cd6b392a228ec87435..bd1cf76a84f7688972d0b655ef3000d52377b54a 100644 (file)
--- a/resource/csdk/security/src/doxmresource.c
+++ b/resource/csdk/security/src/doxmresource.c
@@ -35,6 +35,7 @@
 #include "utlist.h"
 #include "ocrandom.h"
 #include "ocpayload.h"
+#include "ocpayloadcbor.h"
 #include "cainterface.h"
 #include "ocserverrequest.h"
 #include "resourcemanager.h"

diff --git a/resource/csdk/security/src/dpairingresource.c b/resource/csdk/security/src/dpairingresource.c
index cc02e219757876cc3489a8adf980957870b48cbf..e2e4dbbed104d8b50296f35dac7df8c61cbb26d5 100644 (file)
--- a/resource/csdk/security/src/dpairingresource.c
+++ b/resource/csdk/security/src/dpairingresource.c
@@ -39,10 +39,10 @@
 #include "aclresource.h"
 #include "srmutility.h"
 #include "ocserverrequest.h"
-#include "ocpayloadcbor.h"
 #include "ocpayload.h"
+#include "ocpayloadcbor.h"
 #include "payload_logging.h"
-#include <stdlib.h>
+
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif

diff --git a/resource/csdk/security/src/pconfresource.c b/resource/csdk/security/src/pconfresource.c
index cadf8c3b90fbc7f4bde6c71c481aebc38046c3bc..15d5e2d97dd822497876224630dc3dc34dc1893d 100644 (file)
--- a/resource/csdk/security/src/pconfresource.c
+++ b/resource/csdk/security/src/pconfresource.c
@@ -28,6 +28,7 @@
 #include "cJSON.h"
 #include "base64.h"
 #include "ocpayload.h"
+#include "ocpayloadcbor.h"
 #include "payload_logging.h"
 #include "resourcemanager.h"
 #include "pconfresource.h"
@@ -37,7 +38,6 @@
 #include "doxmresource.h"
 #include "srmutility.h"
 #include "ocserverrequest.h"
-#include <stdlib.h>
 #include "psinterface.h"
 #include "security_internals.h"
 #ifdef HAVE_STRINGS_H

diff --git a/resource/csdk/security/src/pstatresource.c b/resource/csdk/security/src/pstatresource.c
index 244078cc68034aceebc6713e67e43a154f198796..5fa0ed37a743a029405258ac3112e4835885d98b 100644 (file)
--- a/resource/csdk/security/src/pstatresource.c
+++ b/resource/csdk/security/src/pstatresource.c
@@ -24,6 +24,7 @@
 #include "ocstack.h"
 #include "oic_malloc.h"
 #include "ocpayload.h"
+#include "ocpayloadcbor.h"
 #include "payload_logging.h"
 #include "resourcemanager.h"
 #include "pstatresource.h"

diff --git a/resource/csdk/security/src/svcresource.c b/resource/csdk/security/src/svcresource.c
index 180176cd8fd16a1a4b992ed0a492d07086a0c6dd..c14ef9bd28fbcca26f7e3bb6c65a2f33c75a8ca4 100644 (file)
--- a/resource/csdk/security/src/svcresource.c
+++ b/resource/csdk/security/src/svcresource.c
@@ -22,6 +22,7 @@
 
 #include "ocstack.h"
 #include "ocpayload.h"
+#include "ocpayloadcbor.h"
 #include "oic_malloc.h"
 #include "utlist.h"
 #include "payload_logging.h"

diff --git a/resource/csdk/security/src/verresource.c b/resource/csdk/security/src/verresource.c
index 78725a7c380940dc3352d917d0f8f6136d795b52..4979170caf8a5b3332170064c1f911fc291796f3 100644 (file)
--- a/resource/csdk/security/src/verresource.c
+++ b/resource/csdk/security/src/verresource.c
@@ -32,6 +32,7 @@
 #include "logger.h"
 #include "payload_logging.h"
 #include "ocpayload.h"
+#include "ocpayloadcbor.h"
 #include "cainterface.h"
 #include "ocserverrequest.h"
 #include "resourcemanager.h"

diff --git a/resource/csdk/stack/include/internal/ocpayloadcbor.h b/resource/csdk/stack/include/internal/ocpayloadcbor.h
index 052afad71ac176f5cd886a0831f6200c4864a4f9..b2cc9327a30dd1cfd5b6f48b758de899b6a7eec7 100644 (file)
--- a/resource/csdk/stack/include/internal/ocpayloadcbor.h
+++ b/resource/csdk/stack/include/internal/ocpayloadcbor.h
@@ -22,6 +22,7 @@
 #define OC_PAYLOAD_CBOR_H
 
 #include "octypes.h"
+#include <cbor.h>
 
 #ifdef __cplusplus
 extern "C"

diff --git a/resource/csdk/stack/include/ocpayload.h b/resource/csdk/stack/include/ocpayload.h
index 22afad3929fcc38e42ab5ecd8fe3ab66ce30935e..d84a7ab98b2658f067a2986a5dbba8d1b2046577 100644 (file)
--- a/resource/csdk/stack/include/ocpayload.h
+++ b/resource/csdk/stack/include/ocpayload.h
@@ -31,7 +31,6 @@
 #include <stdbool.h>
 #include <inttypes.h>
 #include "octypes.h"
-#include <cbor.h>
 
 #if defined(__WITH_TLS__) || defined(__WITH_DTLS__)
 #include "securevirtualresourcetypes.h"