From be4e4658d4d66253dddd2c07fced5c7b3cbef690 Mon Sep 17 00:00:00 2001 From: Jaehong Jo Date: Wed, 12 Oct 2016 16:18:39 +0900 Subject: [PATCH] Fixed static analysis issues in RI. Change-Id: Id6a1b8edb41b3863ba722db43285d28e264dfda8 Signed-off-by: Jaehong Jo Reviewed-on: https://gerrit.iotivity.org/gerrit/13133 Tested-by: jenkins-iotivity Reviewed-by: Habib Virji Reviewed-by: Ashok Babu Channa (cherry picked from commit 07dbd388c00fb4aa122f13d59b5373854a64176f) Reviewed-on: https://gerrit.iotivity.org/gerrit/13823 --- resource/csdk/connectivity/src/caretransmission.c | 2 +- resource/csdk/resource-directory/src/rd_client.c | 5 ++--- resource/csdk/stack/src/ocstack.c | 7 +++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/resource/csdk/connectivity/src/caretransmission.c b/resource/csdk/connectivity/src/caretransmission.c index 7101b4c..c8b2b08 100644 --- a/resource/csdk/connectivity/src/caretransmission.c +++ b/resource/csdk/connectivity/src/caretransmission.c @@ -157,7 +157,7 @@ static bool CACheckTimeout(uint64_t currentTime, CARetransmissionData_t *retData } #else // #1. calculate timeout - uint64_t timeOut = (2 << retData->triedCount) * 1000000; + uint64_t timeOut = (2 << retData->triedCount) * (uint64_t) 1000000; if (currentTime >= retData->timeStamp + timeOut) { diff --git a/resource/csdk/resource-directory/src/rd_client.c b/resource/csdk/resource-directory/src/rd_client.c index 7107649..c63b749 100644 --- a/resource/csdk/resource-directory/src/rd_client.c +++ b/resource/csdk/resource-directory/src/rd_client.c @@ -84,13 +84,12 @@ OCStackResult OCRDPublishWithDeviceId(const char *host, const unsigned char *id, OIC_LOG_V(DEBUG, TAG, "Publish Resource to RD with device id [%s]", id); OCResourceHandle *pubResHandle = resourceHandles; + OCResourceHandle defaultResHandles[OIC_RD_DEFAULT_RESOURCE] = { 0 }; uint8_t nPubResHandles = nHandles; // if resource handles is null, "/oic/p" and "/oic/d" resource will be published to RD. - if (!pubResHandle && !nPubResHandles) + if (!pubResHandle) { - OCResourceHandle defaultResHandles[OIC_RD_DEFAULT_RESOURCE] = { 0 }; - // get "/oic/d" and "/oic/p" resource handle from stack. defaultResHandles[0] = OCGetResourceHandleAtUri(OC_RSRVD_DEVICE_URI); defaultResHandles[1] = OCGetResourceHandleAtUri(OC_RSRVD_PLATFORM_URI); diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c index e3dcef8..a3a47f4 100644 --- a/resource/csdk/stack/src/ocstack.c +++ b/resource/csdk/stack/src/ocstack.c @@ -4990,7 +4990,7 @@ void OCSetNetworkMonitorHandler(CAAdapterStateChangedCB adapterHandler, OCStackResult OCGetDeviceId(OCUUIdentity *deviceId) { OicUuid_t oicUuid; - OCStackResult ret; + OCStackResult ret = OC_STACK_ERROR; ret = GetDoxmDeviceID(&oicUuid); if (OC_STACK_OK == ret) @@ -5007,11 +5007,10 @@ OCStackResult OCGetDeviceId(OCUUIdentity *deviceId) OCStackResult OCSetDeviceId(const OCUUIdentity *deviceId) { OicUuid_t oicUuid; - OCStackResult ret; - OIC_LOG(ERROR, TAG, "Set deviceId DOXM"); + OCStackResult ret = OC_STACK_ERROR; memcpy(&oicUuid, deviceId, UUID_LENGTH); - for(int i=0;i < UUID_LENGTH; i++) + for (int i = 0; i < UUID_LENGTH; i++) { OIC_LOG_V(INFO, TAG, "Set Device Id %x", oicUuid.id[i]); } -- 2.7.4