From 135f5c7cdc533831bd4f447a8d7b9b0f52a6c59f Mon Sep 17 00:00:00 2001 From: Habib Virji Date: Thu, 6 Oct 2016 11:41:18 +0100 Subject: [PATCH] Fix compilation issue in the security stack - Some variable were left unused. - ifdef was - size_t being print with %d Change-Id: I22524cd67a9cc4e1b8cd7844c2d81903b8084985 Signed-off-by: Habib Virji Reviewed-on: https://gerrit.iotivity.org/gerrit/12885 Tested-by: jenkins-iotivity Reviewed-by: Kevin Kane Reviewed-by: Ashwini Kumar Reviewed-by: Randeep Singh (cherry picked from commit a875cebd84216a1f4e3320e67c432e0cb8914be2) Reviewed-on: https://gerrit.iotivity.org/gerrit/12883 --- resource/csdk/security/src/credresource.c | 4 +--- resource/csdk/security/src/doxmresource.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/resource/csdk/security/src/credresource.c b/resource/csdk/security/src/credresource.c index e4da1eb..0b9d41a 100644 --- a/resource/csdk/security/src/credresource.c +++ b/resource/csdk/security/src/credresource.c @@ -159,7 +159,7 @@ size_t GetCredKeyDataSize(const OicSecCred_t* cred) #endif } } - OIC_LOG_V(DEBUG, TAG, "Cred Key Data Size : %d\n", size); + OIC_LOG_V(DEBUG, TAG, "Cred Key Data Size : %zd\n", size); return size; } @@ -1676,7 +1676,6 @@ static OCEntityHandlerResult HandleGetRequest (const OCEntityHandlerRequest * eh const OicSecCred_t *cred = gCred; - size_t credCnt = 0; // This added '256' is arbitrary value that is added to cover the name of the resource, map addition and ending size = GetCredKeyDataSize(cred); size += (256 * OicSecCredCount(cred)); @@ -2124,7 +2123,6 @@ OCStackResult SetCredRownerId(const OicUuid_t* newROwner) memcpy(prevId.id, gCred->rownerID.id, sizeof(prevId.id)); memcpy(gCred->rownerID.id, newROwner->id, sizeof(newROwner->id)); - size_t credCnt = 0; // This added '256' is arbitrary value that is added to cover the name of the resource, map addition and ending size = GetCredKeyDataSize(gCred); size += (256 * OicSecCredCount(gCred)); diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c index 75a726c..2227500 100644 --- a/resource/csdk/security/src/doxmresource.c +++ b/resource/csdk/security/src/doxmresource.c @@ -1210,7 +1210,7 @@ OCStackResult SetDoxmDeviceID(const OicUuid_t *deviceID) //Check the device's OTM state -#ifdef __WITH_DTLS__} +#ifdef __WITH_DTLS__ //for normal device. if(true == gDoxm->owned) { -- 2.7.4