From 7a0c2b4f0c8d3be01b23312bed7a50a51556b68e Mon Sep 17 00:00:00 2001 From: "v.riznyk" Date: Wed, 6 Jun 2018 13:03:38 +0300 Subject: [PATCH] Fix build error dlog string Patch was tested https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/289 (cherry picked from commit b1c8909fa7626bb06f8579aca6a3fb7cdb3ccef4) Change-Id: I5c10ed7e0a74a8d16a007a0a83185dd8ea2390e1 Signed-off-by: v.riznyk Signed-off-by: Amit KS --- .../csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c | 2 +- resource/csdk/security/src/pkix_interface.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c b/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c index 0c9e88a..9b117cd 100644 --- a/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c +++ b/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c @@ -660,7 +660,7 @@ static int SendCallBack(void * tep, const unsigned char * data, size_t dataLen) else if ((size_t)sentLen != dataLen) { OIC_LOG_V(DEBUG, NET_SSL_TAG, - "Packet was partially sent - total/sent/remained bytes : %zd/%zu/%lu", + "Packet was partially sent - total/sent/remained bytes : %zd/%zu/%zu", sentLen, dataLen, (dataLen - sentLen)); } } diff --git a/resource/csdk/security/src/pkix_interface.c b/resource/csdk/security/src/pkix_interface.c index 0058be4..919608d 100644 --- a/resource/csdk/security/src/pkix_interface.c +++ b/resource/csdk/security/src/pkix_interface.c @@ -108,7 +108,7 @@ void CheckInvalidDERSignature(uint8_t *crtBuf, size_t *crtBufLen) return; } - OIC_LOG_V(INFO, TAG, "Cert Buf Length: %lu", *crtBufLen); + OIC_LOG_V(INFO, TAG, "Cert Buf Length: %zu", *crtBufLen); OIC_LOG(INFO, TAG, "[Cert Buf] : "); OIC_LOG_BUFFER(INFO, TAG, crtBuf, *crtBufLen); @@ -268,7 +268,7 @@ void CheckInvalidDERSignature(uint8_t *crtBuf, size_t *crtBufLen) if (removed_total > 0) { // if length of signature is incorrect. - OIC_LOG_V(INFO, TAG, "Cert Length (Before) : %lu", *derCrtBufLen); + OIC_LOG_V(INFO, TAG, "Cert Length (Before) : %zu", *derCrtBufLen); OIC_LOG(INFO, TAG, "Invalid length of signature is dectected."); OIC_LOG(INFO, TAG, "Update signature..."); @@ -320,9 +320,9 @@ void CheckInvalidDERSignature(uint8_t *crtBuf, size_t *crtBufLen) *derCrtBufLen = (size_t)crt_len + remained_len; mbedtls_x509_crt_free(&crt_cpy); - OIC_LOG_V(INFO, TAG, "Dev cert : %lu -> %i", org_len, crt_len); - OIC_LOG_V(INFO, TAG, "Remained chain : %lu", remained_len); - OIC_LOG_V(INFO, TAG, "Cert Length (After) : %lu", *crtBufLen); + OIC_LOG_V(INFO, TAG, "Dev cert : %zu -> %u", org_len, crt_len); + OIC_LOG_V(INFO, TAG, "Remained chain : %zu", remained_len); + OIC_LOG_V(INFO, TAG, "Cert Length (After) : %zu", *crtBufLen); } } else -- 2.7.4