From 581455203b5b1c613e373f48593efd54ad252563 Mon Sep 17 00:00:00 2001 From: Joseph Morrow Date: Tue, 3 Feb 2015 11:26:33 -0500 Subject: [PATCH] Removed warnings from calls to OC_LOG_BUFFER from within stack. OC_LOG_BUFFER() expected "const uint8_t*" not "const unsigned char *". Change-Id: I1e092abaf6af84ad66083c9bcf567d024e64b4d8 Signed-off-by: Joseph Morrow Reviewed-on: https://gerrit.iotivity.org/gerrit/290 Tested-by: jenkins-iotivity Reviewed-by: Yuliya Kamatkova Reviewed-by: Sashi Penta Reviewed-by: Sudarshan Prasad --- resource/csdk/stack/src/occlientcb.c | 6 +++--- resource/csdk/stack/src/ocobserve.c | 6 +++--- resource/csdk/stack/src/ocserverrequest.c | 4 ++-- resource/csdk/stack/src/ocstack.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resource/csdk/stack/src/occlientcb.c b/resource/csdk/stack/src/occlientcb.c index 349d9e1..0bb05f1 100644 --- a/resource/csdk/stack/src/occlientcb.c +++ b/resource/csdk/stack/src/occlientcb.c @@ -108,7 +108,7 @@ void DeleteClientCB(ClientCB * cbNode) { LL_DELETE(cbList, cbNode); OC_LOG(INFO, TAG, PCF("deleting tokens")); CADestroyToken (cbNode->token); - OC_LOG_BUFFER(INFO, TAG, (const unsigned char *)cbNode->token, CA_MAX_TOKEN_LEN); + OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)cbNode->token, CA_MAX_TOKEN_LEN); OCFree(cbNode->handle); OCFree(cbNode->requestUri); if(cbNode->deleteCallback) @@ -145,8 +145,8 @@ ClientCB* GetClientCB(const CAToken_t * token, OCDoHandle handle, const unsigned if(token) { LL_FOREACH(cbList, out) { OC_LOG(INFO, TAG, PCF("comparing tokens")); - OC_LOG_BUFFER(INFO, TAG, (const unsigned char *)*token, CA_MAX_TOKEN_LEN); - OC_LOG_BUFFER(INFO, TAG, (const unsigned char *)out->token, CA_MAX_TOKEN_LEN); + OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)*token, CA_MAX_TOKEN_LEN); + OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)out->token, CA_MAX_TOKEN_LEN); if(memcmp(out->token, *token, CA_MAX_TOKEN_LEN) == 0) { return out; diff --git a/resource/csdk/stack/src/ocobserve.c b/resource/csdk/stack/src/ocobserve.c index 30539bb..778433a 100644 --- a/resource/csdk/stack/src/ocobserve.c +++ b/resource/csdk/stack/src/ocobserve.c @@ -366,8 +366,8 @@ ResourceObserver* GetObserverUsingToken (const CAToken_t * token) LL_FOREACH (serverObsList, out) { OC_LOG(INFO, TAG,PCF("comparing tokens")); - OC_LOG_BUFFER(INFO, TAG, (const unsigned char *)token, CA_MAX_TOKEN_LEN); - OC_LOG_BUFFER(INFO, TAG, (const unsigned char *)out->token, CA_MAX_TOKEN_LEN); + OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)token, CA_MAX_TOKEN_LEN); + OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)out->token, CA_MAX_TOKEN_LEN); if((memcmp(out->token, *token, CA_MAX_TOKEN_LEN) == 0)) { return out; @@ -386,7 +386,7 @@ OCStackResult DeleteObserverUsingToken (CAToken_t * token) if (obsNode) { OC_LOG_V(INFO, TAG, PCF("deleting tokens")); - OC_LOG_BUFFER(INFO, TAG, (const unsigned char *)obsNode->token, CA_MAX_TOKEN_LEN); + OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)obsNode->token, CA_MAX_TOKEN_LEN); LL_DELETE (serverObsList, obsNode); OCFree(obsNode->resUri); OCFree(obsNode->query); diff --git a/resource/csdk/stack/src/ocserverrequest.c b/resource/csdk/stack/src/ocserverrequest.c index b55df7e..eb0e796 100644 --- a/resource/csdk/stack/src/ocserverrequest.c +++ b/resource/csdk/stack/src/ocserverrequest.c @@ -40,8 +40,8 @@ OCServerRequest * GetServerRequestUsingToken (const CAToken_t token) LL_FOREACH (serverRequestList, out) { OC_LOG(INFO, TAG,PCF("comparing tokens")); - OC_LOG_BUFFER(INFO, TAG, (const unsigned char *)token, CA_MAX_TOKEN_LEN); - OC_LOG_BUFFER(INFO, TAG, (const unsigned char *)out->requestToken, CA_MAX_TOKEN_LEN); + OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)token, CA_MAX_TOKEN_LEN); + OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)out->requestToken, CA_MAX_TOKEN_LEN); if(memcmp(out->requestToken, token, CA_MAX_TOKEN_LEN) == 0) { return out; diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c index 4d3e793..81f0749 100644 --- a/resource/csdk/stack/src/ocstack.c +++ b/resource/csdk/stack/src/ocstack.c @@ -742,7 +742,7 @@ void HandleCARequests(const CARemoteEndpoint_t* endPoint, const CARequestInfo_t* } OC_LOG_V(INFO, TAG, "HandleCARequests: CA token length = %d", CA_MAX_TOKEN_LEN); - OC_LOG_BUFFER(INFO, TAG, (const unsigned char *)requestInfo->info.token, CA_MAX_TOKEN_LEN); + OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)requestInfo->info.token, CA_MAX_TOKEN_LEN); serverRequest.requestToken = (CAToken_t)OCMalloc(CA_MAX_TOKEN_LEN+1); // Module Name -- 2.7.4