From 9ca94f2791f3046b852cfe5da2c2e8e9ae1f56f4 Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Tue, 17 Nov 2015 13:32:35 -0800 Subject: [PATCH] Fix payload logging related compile-time warnings. Corrected format specifier for size_t typed value (%lld -> %zu). Removed duplicate UUID_LENGTH definition. Change-Id: Ia142247346cccbadea3a3c51d8e6f55af575c6ff Signed-off-by: Ossama Othman Reviewed-on: https://gerrit.iotivity.org/gerrit/4245 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- resource/csdk/stack/include/payload_logging.h | 3 +-- .../csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/resource/csdk/stack/include/payload_logging.h b/resource/csdk/stack/include/payload_logging.h index 2c181cd..bfbfbde 100644 --- a/resource/csdk/stack/include/payload_logging.h +++ b/resource/csdk/stack/include/payload_logging.h @@ -42,7 +42,6 @@ extern "C" #ifdef TB_LOG #define OC_LOG_PAYLOAD(level, payload) OCPayloadLog((level),(payload)) #define UUID_SIZE (16) - #define UUID_LENGTH (37) const char *convertTriggerEnumToString(OCPresenceTrigger trigger); OCPresenceTrigger convertTriggerStringToEnum(const char * triggerStr); @@ -131,7 +130,7 @@ static inline void OCPayloadLogRep(LogLevel level, OCRepPayload* payload) val->arr.dimensions[2]); break; case OCREP_PROP_BYTE_STRING: - OC_LOG_V(level, PL_TAG, "\t\t%s(byte array):%lld x %lld x %lld", + OC_LOG_V(level, PL_TAG, "\t\t%s(byte array):%zu x %zu x %zu", val->name, val->arr.dimensions[0], val->arr.dimensions[1], val->arr.dimensions[2]); diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp index d396db1..bf9452f 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp @@ -394,6 +394,11 @@ void queryResource() void collectUniqueResource(const OCClientResponse * clientResponse) { OCResourcePayload* res = ((OCDiscoveryPayload*)clientResponse->payload)->resources; + + // Including the NUL terminator, length of UUID string of the form: + // "a62389f7-afde-00b6-cd3e-12b97d2fcf09" +# define UUID_LENGTH 37 + char sidStr[UUID_LENGTH]; while(res) { -- 2.7.4