From 15b1a05bcca5d1b948a25fcec867970e87e4eb1e Mon Sep 17 00:00:00 2001 From: Habib Virji Date: Mon, 12 Oct 2015 17:14:55 +0100 Subject: [PATCH] Fix format used in OIC_LOG_V There was wrong format used for int64_t variable. Change-Id: I52a1887600d0f004fcea2081058872f684572431 Signed-off-by: Habib Virji Reviewed-on: https://gerrit.iotivity.org/gerrit/3825 Tested-by: jenkins-iotivity Reviewed-by: Erich Keane --- resource/csdk/stack/include/payload_logging.h | 2 +- resource/csdk/stack/src/ocpayloadconvert.c | 4 ++-- resource/src/OCResource.cpp | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/resource/csdk/stack/include/payload_logging.h b/resource/csdk/stack/include/payload_logging.h index 817b961..3938c17 100644 --- a/resource/csdk/stack/include/payload_logging.h +++ b/resource/csdk/stack/include/payload_logging.h @@ -83,7 +83,7 @@ static inline void OCPayloadLogRep(LogLevel level, OCRepPayload* payload) OC_LOG_V(level, PL_TAG, "\t\t%s: NULL", val->name); break; case OCREP_PROP_INT: - OC_LOG_V(level, PL_TAG, "\t\t%s(int):%lld", val->name, val->i); + OC_LOG_V(level, PL_TAG, "\t\t%s(int):%zd", val->name, val->i); break; case OCREP_PROP_DOUBLE: OC_LOG_V(level, PL_TAG, "\t\t%s(double):%f", val->name, val->d); diff --git a/resource/csdk/stack/src/ocpayloadconvert.c b/resource/csdk/stack/src/ocpayloadconvert.c index eacfca6..062df00 100644 --- a/resource/csdk/stack/src/ocpayloadconvert.c +++ b/resource/csdk/stack/src/ocpayloadconvert.c @@ -166,7 +166,7 @@ static int64_t checkError(int64_t err, CborEncoder* encoder, uint8_t* outPayload } else if (err != 0) { - OC_LOG_V(ERROR, TAG, "Convert Payload failed with %lld", err); + OC_LOG_V(ERROR, TAG, "Convert Payload failed : %zd", err); return err; } else @@ -175,6 +175,7 @@ static int64_t checkError(int64_t err, CborEncoder* encoder, uint8_t* outPayload return 0; } } + static int64_t OCConvertSecurityPayload(OCSecurityPayload* payload, uint8_t* outPayload, size_t* size) { @@ -200,7 +201,6 @@ static int64_t OCConvertSecurityPayload(OCSecurityPayload* payload, uint8_t* out err = err | cbor_encoder_close_container(&encoder, &rootArray); return checkError(err, &encoder, outPayload, size); - } static char* OCStringLLJoin(OCStringLL* val) diff --git a/resource/src/OCResource.cpp b/resource/src/OCResource.cpp index 8467fc7..d8944db 100644 --- a/resource/src/OCResource.cpp +++ b/resource/src/OCResource.cpp @@ -69,7 +69,11 @@ OCResource::OCResource(std::weak_ptr clientWrapper, const std::vector& interfaces) : m_clientWrapper(clientWrapper), m_uri(uri), m_resourceId(serverId, m_uri), - m_devAddr{ OC_DEFAULT_ADAPTER, OC_DEFAULT_FLAGS, 0, {0}, 0 }, + m_devAddr{ OC_DEFAULT_ADAPTER, OC_DEFAULT_FLAGS, 0, {0}, 0 +#if defined (ROUTING_GATEWAY) || defined (ROUTING_EP) + , {0} +#endif + }, m_isObservable(observable), m_isCollection(false), m_resourceTypes(resourceTypes), m_interfaces(interfaces), m_observeHandle(nullptr) @@ -562,4 +566,3 @@ bool OCResourceIdentifier::operator>=(const OCResourceIdentifier &other) const } } // namespace OC - -- 2.7.4