From 3fe0dbdd8d7a366bd28db8251773db3beef2ebfa Mon Sep 17 00:00:00 2001 From: Ravi Nanjundappa Date: Tue, 30 Jun 2015 09:43:32 +0530 Subject: [PATCH] Fix compile warnings in SimpleClientServer for Linux SimpleClientServer application for Linux was trying to check the address of array 'clientResponse->rcvdVendorSpecificHeaderOptions' which will always evaluate to 'true'. Corrected by removing such checks in the code. Change-Id: Id7306af0792646887740ab3c7952d5fffe8c760b Signed-off-by: Ravi Nanjundappa Reviewed-on: https://gerrit.iotivity.org/gerrit/1454 Tested-by: jenkins-iotivity Reviewed-by: Erich Keane --- resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp | 3 +-- .../csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp index 93689fb..7e40e7e 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp @@ -227,8 +227,7 @@ OCStackApplicationResult getReqCB(void* ctx, OCDoHandle handle, OCClientResponse OC_LOG_V(INFO, TAG, "SEQUENCE NUMBER: %d", clientResponse->sequenceNumber); OC_LOG_V(INFO, TAG, "JSON = %s =============> Get Response", clientResponse->resJSONPayload); - if(clientResponse->rcvdVendorSpecificHeaderOptions && - clientResponse->numRcvdVendorSpecificHeaderOptions) + if(clientResponse->numRcvdVendorSpecificHeaderOptions > 0) { OC_LOG (INFO, TAG, "Received vendor specific options"); uint8_t i = 0; diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp index 45af118..fa59537 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp @@ -172,8 +172,7 @@ OCStackApplicationResult getReqCB(void* ctx, OCDoHandle handle, OC_LOG_V(INFO, TAG,"Get Response: %s \nFrom %s:%d\n", clientResponse->resJSONPayload, clientResponse->devAddr.addr, clientResponse->devAddr.port); - if (clientResponse->rcvdVendorSpecificHeaderOptions - && clientResponse->numRcvdVendorSpecificHeaderOptions) + if (clientResponse->numRcvdVendorSpecificHeaderOptions > 0 ) { OC_LOG (INFO, TAG, "Received vendor specific options"); uint8_t i = 0; -- 2.7.4