From: jihwan.seo Date: Tue, 22 Dec 2015 08:42:42 +0000 (+0900) Subject: Removed unneccessary code for stack X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=296901f09ec0136a393ef98aa752e84bff0ac06b;p=contrib%2Fiotivity.git Removed unneccessary code for stack I have removed unneccessary code for stack and some code format has been changed more clearly Change-Id: Ia9d970a2a8b6e3637f472d6384993d512b791514 Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/4701 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- diff --git a/resource/csdk/stack/src/occlientcb.c b/resource/csdk/stack/src/occlientcb.c index 4329c39..38cee83 100644 --- a/resource/csdk/stack/src/occlientcb.c +++ b/resource/csdk/stack/src/occlientcb.c @@ -48,7 +48,7 @@ AddClientCB (ClientCB** clientCB, OCCallbackData* cbData, OCDevAddr *devAddr, char * requestUri, char * resourceTypeName, uint32_t ttl) { - if(!clientCB || !cbData || !handle || !requestUri || tokenLength > CA_MAX_TOKEN_LEN) + if (!clientCB || !cbData || !handle || !requestUri || tokenLength > CA_MAX_TOKEN_LEN) { return OC_STACK_INVALID_PARAM; } @@ -56,16 +56,16 @@ AddClientCB (ClientCB** clientCB, OCCallbackData* cbData, ClientCB *cbNode = NULL; #ifdef WITH_PRESENCE - if(method == OC_REST_PRESENCE) + if (method == OC_REST_PRESENCE) { // Retrieve the presence callback structure for this specific requestUri. cbNode = GetClientCB(NULL, 0, NULL, requestUri); } -#endif // WITH_PRESENCE - if(!cbNode)// If it does not already exist, create new node. + if (!cbNode)// If it does not already exist, create new node. +#endif // WITH_PRESENCE { cbNode = (ClientCB*) OICMalloc(sizeof(ClientCB)); - if(!cbNode) + if (!cbNode) { *clientCB = NULL; goto exit; @@ -84,10 +84,10 @@ AddClientCB (ClientCB** clientCB, OCCallbackData* cbData, cbNode->handle = *handle; cbNode->method = method; cbNode->sequenceNumber = 0; - #ifdef WITH_PRESENCE +#ifdef WITH_PRESENCE cbNode->presence = NULL; cbNode->filterResourceType = NULL; - #endif // WITH_PRESENCE +#endif // WITH_PRESENCE if (method == OC_REST_PRESENCE || method == OC_REST_OBSERVE || @@ -106,6 +106,7 @@ AddClientCB (ClientCB** clientCB, OCCallbackData* cbData, *clientCB = cbNode; } } +#ifdef WITH_PRESENCE else { // Ensure that the handle the SDK hands back up to the application layer for the @@ -124,8 +125,7 @@ AddClientCB (ClientCB** clientCB, OCCallbackData* cbData, *handle = cbNode->handle; } -#ifdef WITH_PRESENCE - if(method == OC_REST_PRESENCE && resourceTypeName) + if (method == OC_REST_PRESENCE && resourceTypeName) { // Amend the found or created node by adding a new resourceType to it. return InsertResourceTypeFilter(cbNode,(char *)resourceTypeName); @@ -142,12 +142,12 @@ AddClientCB (ClientCB** clientCB, OCCallbackData* cbData, return OC_STACK_OK; exit: - return OC_STACK_NO_MEMORY; + return OC_STACK_NO_MEMORY; } void DeleteClientCB(ClientCB * cbNode) { - if(cbNode) + if (cbNode) { LL_DELETE(cbList, cbNode); OC_LOG (INFO, TAG, "Deleting token"); @@ -157,18 +157,18 @@ void DeleteClientCB(ClientCB * cbNode) OICFree(cbNode->handle); OC_LOG_V (INFO, TAG, "Deleting callback with uri %s", cbNode->requestUri); OICFree(cbNode->requestUri); - if(cbNode->deleteCallback) + if (cbNode->deleteCallback) { cbNode->deleteCallback(cbNode->context); } #ifdef WITH_PRESENCE - if(cbNode->presence) + if (cbNode->presence) { OICFree(cbNode->presence->timeOut); OICFree(cbNode->presence); } - if(cbNode->method == OC_REST_PRESENCE) + if (cbNode->method == OC_REST_PRESENCE) { OCResourceType * pointer = cbNode->filterResourceType; OCResourceType * next = NULL; @@ -216,10 +216,9 @@ static void CheckAndDeleteTimedOutCB(ClientCB* cbNode) ClientCB* GetClientCB(const CAToken_t token, uint8_t tokenLength, OCDoHandle handle, const char * requestUri) { - ClientCB* out = NULL; - if(token && *token && tokenLength <= CA_MAX_TOKEN_LEN && tokenLength > 0) + if (token && *token && tokenLength <= CA_MAX_TOKEN_LEN && tokenLength > 0) { OC_LOG (INFO, TAG, "Looking for token"); OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)token, tokenLength); @@ -228,31 +227,31 @@ ClientCB* GetClientCB(const CAToken_t token, uint8_t tokenLength, { OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)out->token, tokenLength); - if(memcmp(out->token, token, tokenLength) == 0) + if (memcmp(out->token, token, tokenLength) == 0) { return out; } CheckAndDeleteTimedOutCB(out); } } - else if(handle) + else if (handle) { LL_FOREACH(cbList, out) { - if(out->handle == handle) + if (out->handle == handle) { return out; } CheckAndDeleteTimedOutCB(out); } } - else if(requestUri) + else if (requestUri) { OC_LOG_V(INFO, TAG, "Looking for uri %s", requestUri); LL_FOREACH(cbList, out) { OC_LOG_V(INFO, TAG, "\tFound %s", out->requestUri); - if(out->requestUri && strcmp(out->requestUri, requestUri ) == 0) + if (out->requestUri && strcmp(out->requestUri, requestUri ) == 0) { return out; } @@ -267,11 +266,11 @@ ClientCB* GetClientCB(const CAToken_t token, uint8_t tokenLength, OCStackResult InsertResourceTypeFilter(ClientCB * cbNode, char * resourceTypeName) { OCResourceType * newResourceType = NULL; - if(cbNode && resourceTypeName) + if (cbNode && resourceTypeName) { // Form a new resourceType member. newResourceType = (OCResourceType *) OICMalloc(sizeof(OCResourceType)); - if(!newResourceType) + if (!newResourceType) { return OC_STACK_NO_MEMORY; } @@ -300,7 +299,7 @@ void DeleteClientCBList() void FindAndDeleteClientCB(ClientCB * cbNode) { ClientCB* tmp; - if(cbNode) + if (cbNode) { LL_FOREACH(cbList, tmp) { @@ -315,15 +314,12 @@ void FindAndDeleteClientCB(ClientCB * cbNode) OCStackResult AddMCPresenceNode(OCMulticastNode** outnode, char* uri, uint32_t nonce) { - if(!outnode) + if (!outnode) { return OC_STACK_INVALID_PARAM; } - OCMulticastNode *node; - - node = (OCMulticastNode*) OICMalloc(sizeof(OCMulticastNode)); - + OCMulticastNode *node = (OCMulticastNode*) OICMalloc(sizeof(*node)); if (node) { node->nonce = nonce; @@ -338,13 +334,12 @@ OCStackResult AddMCPresenceNode(OCMulticastNode** outnode, char* uri, uint32_t n OCMulticastNode* GetMCPresenceNode(const char * uri) { - OCMulticastNode* out = NULL; - - if(uri) + if (uri) { + OCMulticastNode* out = NULL; LL_FOREACH(mcPresenceNodes, out) { - if(out->uri && strcmp(out->uri, uri) == 0) + if (out->uri && strcmp(out->uri, uri) == 0) { return out; } @@ -353,4 +348,3 @@ OCMulticastNode* GetMCPresenceNode(const char * uri) OC_LOG(INFO, TAG, "MulticastNode Not found !!"); return NULL; } - diff --git a/resource/csdk/stack/src/occollection.c b/resource/csdk/stack/src/occollection.c index 5684f6a..48249d5 100644 --- a/resource/csdk/stack/src/occollection.c +++ b/resource/csdk/stack/src/occollection.c @@ -51,7 +51,7 @@ static OCStackResult CheckRTParamSupport(const OCResource* resource, const char* rtPtr) { - if(!resource || !rtPtr) + if (!resource || !rtPtr) { return OC_STACK_INVALID_PARAM; } @@ -59,7 +59,7 @@ static OCStackResult CheckRTParamSupport(const OCResource* resource, const char* OCResourceType* rTPointer = resource->rsrcType; while (rTPointer) { - if( strcmp (rTPointer->resourcetypename, rtPtr) == 0) + if (strcmp(rTPointer->resourcetypename, rtPtr) == 0) { return OC_STACK_OK; } @@ -71,7 +71,7 @@ static OCStackResult CheckRTParamSupport(const OCResource* resource, const char* static OCStackResult CheckIFParamSupport(const OCResource* resource, const char* ifPtr) { - if(!resource || !ifPtr) + if (!resource || !ifPtr) { return OC_STACK_INVALID_PARAM; } @@ -79,7 +79,7 @@ static OCStackResult CheckIFParamSupport(const OCResource* resource, const char* OCResourceInterface* iFPointer = resource->rsrcInterface; while (iFPointer) { - if( strcmp (iFPointer->name, ifPtr) == 0) + if (strcmp(iFPointer->name, ifPtr) == 0) { return OC_STACK_OK; } @@ -91,7 +91,7 @@ static OCStackResult CheckIFParamSupport(const OCResource* resource, const char* static OCStackResult ValidateQuery (const char *query, OCResourceHandle resource, - OCStackIfTypes *ifParam, char **rtParam) + OCStackIfTypes *ifParam, char **rtParam) { uint8_t numFields = 0; uint8_t numParam; @@ -106,7 +106,7 @@ ValidateQuery (const char *query, OCResourceHandle resource, return OC_STACK_ERROR; } - if(!ifParam || !rtParam) + if (!ifParam || !rtParam) { return OC_STACK_INVALID_PARAM; } @@ -172,7 +172,7 @@ ValidateQuery (const char *query, OCResourceHandle resource, if (ifPtr) { - if(CheckIFParamSupport((OCResource *)resource, ifPtr) != OC_STACK_OK) + if (CheckIFParamSupport((OCResource *)resource, ifPtr) != OC_STACK_OK) { return OC_STACK_INVALID_QUERY; } @@ -188,7 +188,7 @@ ValidateQuery (const char *query, OCResourceHandle resource, { *ifParam = STACK_IF_BATCH; } - else if(strcmp (ifPtr, OC_RSRVD_INTERFACE_GROUP) == 0) + else if (strcmp (ifPtr, OC_RSRVD_INTERFACE_GROUP) == 0) { *ifParam = STACK_IF_GROUP; } @@ -231,36 +231,33 @@ HandleLinkedListInterface(OCEntityHandlerRequest *ehRequest, { (void)filterOn; (void)filterValue; - if(!ehRequest) + if (!ehRequest) { return OC_STACK_INVALID_PARAM; } - OCStackResult ret = OC_STACK_OK; OCResource *collResource = (OCResource *)ehRequest->resource; OCRepPayload* payload = NULL; - - if(ret == OC_STACK_OK) - { - ret = BuildResponseRepresentation(collResource, &payload); - } - + OCStackResult ret = BuildResponseRepresentation(collResource, &payload); if (ret == OC_STACK_OK) { - for (int i = 0; i < MAX_CONTAINED_RESOURCES && ret == OC_STACK_OK; i++) + for (size_t i = 0; i < MAX_CONTAINED_RESOURCES && ret == OC_STACK_OK; i++) { - OCResource* temp = collResource->rsrcResources[i]; - if (temp) + if (collResource) { - //TODO : Add resource type filtering once collections - // start supporting queries. - ret = BuildResponseRepresentation(temp, &payload); + OCResource* temp = collResource->rsrcResources[i]; + if (temp) + { + //TODO : Add resource type filtering once collections + // start supporting queries. + ret = BuildResponseRepresentation(temp, &payload); + } } } } - if(ret == OC_STACK_OK) + if (ret == OC_STACK_OK) { OCEntityHandlerResponse response = {0}; response.ehResult = OC_EH_OK; @@ -282,38 +279,30 @@ HandleBatchInterface(OCEntityHandlerRequest *ehRequest) return OC_STACK_INVALID_PARAM; } - OCStackResult stackRet = OC_STACK_OK; - OCEntityHandlerResult ehResult = OC_EH_ERROR; OCResource * collResource = (OCResource *) ehRequest->resource; OCRepPayload* payload = OCRepPayloadCreate(); - if(!payload) + if (!payload) { - stackRet = OC_STACK_NO_MEMORY; + return OC_STACK_NO_MEMORY; } - if(stackRet == OC_STACK_OK) + if (collResource) { - if (collResource) - { - OCRepPayloadSetUri(payload, collResource->uri); - } + OCRepPayloadSetUri(payload, collResource->uri); } - if(stackRet == OC_STACK_OK) - { - OCEntityHandlerResponse response = {0}; - response.ehResult = OC_EH_OK; - response.payload = (OCPayload*)payload; - response.persistentBufferFlag = 0; - response.requestHandle = (OCRequestHandle) ehRequest->requestHandle; - response.resourceHandle = (OCResourceHandle) collResource; - stackRet = OCDoResponse(&response); - } + OCEntityHandlerResponse response = {0}; + response.ehResult = OC_EH_OK; + response.payload = (OCPayload*)payload; + response.persistentBufferFlag = 0; + response.requestHandle = (OCRequestHandle) ehRequest->requestHandle; + response.resourceHandle = (OCResourceHandle) collResource; + OCStackResult stackRet = OCDoResponse(&response); if (stackRet == OC_STACK_OK) { - for (uint8_t i = 0; i < MAX_CONTAINED_RESOURCES; i++) + for (uint8_t i = 0; i < MAX_CONTAINED_RESOURCES; i++) { OCResource* temp = collResource->rsrcResources[i]; if (temp) @@ -323,17 +312,17 @@ HandleBatchInterface(OCEntityHandlerRequest *ehRequest) // is ehRequest->resource ehRequest->resource = (OCResourceHandle) temp; - ehResult = temp->entityHandler(OC_REQUEST_FLAG, ehRequest, - temp->entityHandlerCallbackParam); + OCEntityHandlerResult ehResult = temp->entityHandler(OC_REQUEST_FLAG, ehRequest, + temp->entityHandlerCallbackParam); // The default collection handler is returning as OK - if(stackRet != OC_STACK_SLOW_RESOURCE) + if (stackRet != OC_STACK_SLOW_RESOURCE) { stackRet = OC_STACK_OK; } // if a single resource is slow, then entire response will be treated // as slow response - if(ehResult == OC_EH_SLOW) + if (ehResult == OC_EH_SLOW) { OC_LOG(INFO, TAG, "This is a slow resource"); ((OCServerRequest *)ehRequest->requestHandle)->slowFlag = 1; @@ -352,7 +341,7 @@ HandleBatchInterface(OCEntityHandlerRequest *ehRequest) uint8_t GetNumOfResourcesInCollection (OCResource *resource) { - if(resource) + if (resource) { uint8_t num = 0; for (uint8_t i = 0; i < MAX_CONTAINED_RESOURCES; i++) @@ -374,15 +363,11 @@ uint8_t GetNumOfResourcesInCollection (OCResource *resource) OCStackResult DefaultCollectionEntityHandler (OCEntityHandlerFlag flag, OCEntityHandlerRequest *ehRequest) { - if(!ehRequest || !ehRequest->query) + if (!ehRequest || !ehRequest->query) { return OC_STACK_INVALID_PARAM; } - OCStackResult result = OC_STACK_ERROR; - OCStackIfTypes ifQueryParam = STACK_IF_INVALID; - char *rtQueryParam = NULL; - OC_LOG_V(INFO, TAG, "DefaultCollectionEntityHandler with query %s", ehRequest->query); if (flag != OC_REQUEST_FLAG) @@ -390,8 +375,10 @@ OCStackResult DefaultCollectionEntityHandler (OCEntityHandlerFlag flag, return OC_STACK_ERROR; } - result = ValidateQuery (ehRequest->query, - ehRequest->resource, &ifQueryParam, &rtQueryParam); + OCStackIfTypes ifQueryParam = STACK_IF_INVALID; + char *rtQueryParam = NULL; + OCStackResult result = ValidateQuery (ehRequest->query, + ehRequest->resource, &ifQueryParam, &rtQueryParam); if (result != OC_STACK_OK) { diff --git a/resource/csdk/stack/src/ocobserve.c b/resource/csdk/stack/src/ocobserve.c index 6bcaa1c..1d3e359 100644 --- a/resource/csdk/stack/src/ocobserve.c +++ b/resource/csdk/stack/src/ocobserve.c @@ -42,7 +42,7 @@ #define VERIFY_NON_NULL(arg) { if (!arg) {OC_LOG(FATAL, TAG, #arg " is NULL"); goto exit;} } -static struct ResourceObserver * serverObsList = NULL; +static struct ResourceObserver * g_serverObsList = NULL; /** * Determine observe QOS based on the QOS of the request. * The qos passed as a parameter overrides what the client requested. @@ -57,28 +57,28 @@ static struct ResourceObserver * serverObsList = NULL; static OCQualityOfService DetermineObserverQoS(OCMethod method, ResourceObserver * resourceObserver, OCQualityOfService appQoS) { - if(!resourceObserver) + if (!resourceObserver) { OC_LOG(ERROR, TAG, "DetermineObserverQoS called with invalid resourceObserver"); return OC_NA_QOS; } OCQualityOfService decidedQoS = appQoS; - if(appQoS == OC_NA_QOS) + if (appQoS == OC_NA_QOS) { decidedQoS = resourceObserver->qos; } - if(appQoS != OC_HIGH_QOS) + if (appQoS != OC_HIGH_QOS) { OC_LOG_V(INFO, TAG, "Current NON count for this observer is %d", resourceObserver->lowQosCount); #ifdef WITH_PRESENCE - if((resourceObserver->forceHighQos \ + if ((resourceObserver->forceHighQos \ || resourceObserver->lowQosCount >= MAX_OBSERVER_NON_COUNT) \ && method != OC_REST_PRESENCE) #else - if(resourceObserver->forceHighQos \ + if (resourceObserver->forceHighQos \ || resourceObserver->lowQosCount >= MAX_OBSERVER_NON_COUNT) #endif { @@ -105,13 +105,13 @@ OCStackResult SendAllObserverNotification (OCMethod method, OCResource *resPtr, #endif { OC_LOG(INFO, TAG, "Entering SendObserverNotification"); - if(!resPtr) + if (!resPtr) { return OC_STACK_INVALID_PARAM; } OCStackResult result = OC_STACK_ERROR; - ResourceObserver * resourceObserver = serverObsList; + ResourceObserver * resourceObserver = g_serverObsList; uint8_t numObs = 0; OCServerRequest * request = NULL; OCEntityHandlerRequest ehRequest = {0}; @@ -125,7 +125,7 @@ OCStackResult SendAllObserverNotification (OCMethod method, OCResource *resPtr, { numObs++; #ifdef WITH_PRESENCE - if(method != OC_REST_PRESENCE) + if (method != OC_REST_PRESENCE) { #endif qos = DetermineObserverQoS(method, resourceObserver, qos); @@ -137,10 +137,10 @@ OCStackResult SendAllObserverNotification (OCMethod method, OCResource *resPtr, resourceObserver->resUri, 0, resourceObserver->acceptFormat, &resourceObserver->devAddr); - if(request) + if (request) { request->observeResult = OC_STACK_OK; - if(result == OC_STACK_OK) + if (result == OC_STACK_OK) { result = FormOCEntityHandlerRequest( &ehRequest, @@ -156,11 +156,11 @@ OCStackResult SendAllObserverNotification (OCMethod method, OCResource *resPtr, request->rcvdVendorSpecificHeaderOptions, OC_OBSERVE_NO_OPTION, 0); - if(result == OC_STACK_OK) + if (result == OC_STACK_OK) { ehResult = resPtr->entityHandler(OC_REQUEST_FLAG, &ehRequest, resPtr->entityHandlerCallbackParam); - if(ehResult == OC_EH_ERROR) + if (ehResult == OC_EH_ERROR) { FindAndDeleteServerRequest(request); } @@ -183,18 +183,18 @@ OCStackResult SendAllObserverNotification (OCMethod method, OCResource *resPtr, resourceObserver->resUri, 0, resourceObserver->acceptFormat, &resourceObserver->devAddr); - if(result == OC_STACK_OK) + if (result == OC_STACK_OK) { OCPresencePayload* presenceResBuf = OCPresencePayloadCreate( resPtr->sequenceNum, maxAge, trigger, resourceType ? resourceType->resourcetypename : NULL); - if(!presenceResBuf) + if (!presenceResBuf) { return OC_STACK_NO_MEMORY; } - if(result == OC_STACK_OK) + if (result == OC_STACK_OK) { ehResponse.ehResult = OC_EH_OK; ehResponse.payload = (OCPayload*)presenceResBuf; @@ -240,7 +240,7 @@ OCStackResult SendListObserverNotification (OCResource * resource, OCQualityOfService qos) { (void)maxAge; - if(!resource || !obsIdList || !payload) + if (!resource || !obsIdList || !payload) { return OC_STACK_INVALID_PARAM; } @@ -256,7 +256,7 @@ OCStackResult SendListObserverNotification (OCResource * resource, while(numIds) { observer = GetObserverUsingId (*obsIdList); - if(observer) + if (observer) { // Found observer - verify if it matches the resource handle if (observer->resource == resource) @@ -270,15 +270,15 @@ OCStackResult SendListObserverNotification (OCResource * resource, observer->resUri, 0, observer->acceptFormat, &observer->devAddr); - if(request) + if (request) { request->observeResult = OC_STACK_OK; - if(result == OC_STACK_OK) + if (result == OC_STACK_OK) { OCEntityHandlerResponse ehResponse = {0}; ehResponse.ehResult = OC_EH_OK; ehResponse.payload = (OCPayload*)OCRepPayloadCreate(); - if(!ehResponse.payload) + if (!ehResponse.payload) { FindAndDeleteServerRequest(request); continue; @@ -288,7 +288,7 @@ OCStackResult SendListObserverNotification (OCResource * resource, ehResponse.requestHandle = (OCRequestHandle) request; ehResponse.resourceHandle = (OCResourceHandle) resource; result = OCDoResponse(&ehResponse); - if(result == OC_STACK_OK) + if (result == OC_STACK_OK) { OC_LOG_V(INFO, TAG, "Observer id %d notified.", *obsIdList); @@ -320,11 +320,11 @@ OCStackResult SendListObserverNotification (OCResource * resource, numIds--; } - if(numSentNotification == numberOfIds && !observeErrorFlag) + if (numSentNotification == numberOfIds && !observeErrorFlag) { return OC_STACK_OK; } - else if(numSentNotification == 0) + else if (numSentNotification == 0) { return OC_STACK_NO_OBSERVERS; } @@ -375,14 +375,13 @@ OCStackResult AddObserver (const char *resUri, { return OC_STACK_RESOURCE_ERROR; } - ResourceObserver *obsNode = NULL; - if(!resUri || !token || !*token) + if (!resUri || !token || !*token) { return OC_STACK_INVALID_PARAM; } - obsNode = (ResourceObserver *) OICCalloc(1, sizeof(ResourceObserver)); + ResourceObserver *obsNode = (ResourceObserver *) OICCalloc(1, sizeof(ResourceObserver)); if (obsNode) { obsNode->observeId = obsId; @@ -392,14 +391,14 @@ OCStackResult AddObserver (const char *resUri, obsNode->qos = qos; obsNode->acceptFormat = acceptFormat; - if(query) + if (query) { obsNode->query = OICStrdup(query); VERIFY_NON_NULL (obsNode->query); } // If tokenLength is zero, the return value depends on the // particular library implementation (it may or may not be a null pointer). - if(tokenLength) + if (tokenLength) { obsNode->token = (CAToken_t)OICMalloc(tokenLength); VERIFY_NON_NULL (obsNode->token); @@ -410,7 +409,7 @@ OCStackResult AddObserver (const char *resUri, obsNode->devAddr = *devAddr; obsNode->resource = resHandle; - LL_APPEND (serverObsList, obsNode); + LL_APPEND (g_serverObsList, obsNode); return OC_STACK_OK; } @@ -431,7 +430,7 @@ ResourceObserver* GetObserverUsingId (const OCObservationId observeId) if (observeId) { - LL_FOREACH (serverObsList, out) + LL_FOREACH (g_serverObsList, out) { if (out->observeId == observeId) { @@ -447,16 +446,16 @@ ResourceObserver* GetObserverUsingToken (const CAToken_t token, uint8_t tokenLen { ResourceObserver *out = NULL; - if(token && *token) + if (token && *token) { OC_LOG(INFO, TAG, "Looking for token"); OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)token, tokenLength); OC_LOG(INFO, TAG, "\tFound token:"); - LL_FOREACH (serverObsList, out) + LL_FOREACH (g_serverObsList, out) { OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)out->token, tokenLength); - if((memcmp(out->token, token, tokenLength) == 0)) + if ((memcmp(out->token, token, tokenLength) == 0)) { return out; } @@ -473,19 +472,17 @@ ResourceObserver* GetObserverUsingToken (const CAToken_t token, uint8_t tokenLen OCStackResult DeleteObserverUsingToken (CAToken_t token, uint8_t tokenLength) { - if(!token || !*token) + if (!token || !*token) { return OC_STACK_INVALID_PARAM; } - ResourceObserver *obsNode = NULL; - - obsNode = GetObserverUsingToken (token, tokenLength); + ResourceObserver *obsNode = GetObserverUsingToken (token, tokenLength); if (obsNode) { OC_LOG_V(INFO, TAG, "deleting observer id %u with token", obsNode->observeId); OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)obsNode->token, tokenLength); - LL_DELETE (serverObsList, obsNode); + LL_DELETE (g_serverObsList, obsNode); OICFree(obsNode->resUri); OICFree(obsNode->query); OICFree(obsNode->token); @@ -499,14 +496,14 @@ void DeleteObserverList() { ResourceObserver *out = NULL; ResourceObserver *tmp = NULL; - LL_FOREACH_SAFE (serverObsList, out, tmp) + LL_FOREACH_SAFE (g_serverObsList, out, tmp) { - if(out) + if (out) { DeleteObserverUsingToken ((out->token), out->tokenLength); } } - serverObsList = NULL; + g_serverObsList = NULL; } /* @@ -523,7 +520,7 @@ CreateObserveHeaderOption (CAHeaderOption_t **caHdrOpt, uint8_t numOptions, uint8_t observeFlag) { - if(!caHdrOpt) + if (!caHdrOpt) { return OC_STACK_INVALID_PARAM; } @@ -567,12 +564,12 @@ GetObserveHeaderOption (uint32_t * observationOption, CAHeaderOption_t *options, uint8_t * numOptions) { - if(!observationOption) + if (!observationOption) { return OC_STACK_INVALID_PARAM; } - if(!options || !numOptions) + if (!options || !numOptions) { OC_LOG (INFO, TAG, "No options present"); return OC_STACK_OK; @@ -580,7 +577,7 @@ GetObserveHeaderOption (uint32_t * observationOption, for(uint8_t i = 0; i < *numOptions; i++) { - if(options[i].protocolID == CA_COAP_ID && + if (options[i].protocolID == CA_COAP_ID && options[i].optionID == COAP_OPTION_OBSERVE) { *observationOption = options[i].optionData[0]; diff --git a/resource/csdk/stack/src/ocpayload.c b/resource/csdk/stack/src/ocpayload.c index 485eda3..f8e5429 100755 --- a/resource/csdk/stack/src/ocpayload.c +++ b/resource/csdk/stack/src/ocpayload.c @@ -35,7 +35,7 @@ static void FreeOCDiscoveryResource(OCResourcePayload* payload); void OCPayloadDestroy(OCPayload* payload) { - if(!payload) + if (!payload) { return; } @@ -73,7 +73,7 @@ OCRepPayload* OCRepPayloadCreate() { OCRepPayload* payload = (OCRepPayload*)OICCalloc(1, sizeof(OCRepPayload)); - if(!payload) + if (!payload) { return NULL; } @@ -85,7 +85,7 @@ OCRepPayload* OCRepPayloadCreate() void OCRepPayloadAppend(OCRepPayload* parent, OCRepPayload* child) { - if(!parent) + if (!parent) { return; } @@ -101,7 +101,7 @@ void OCRepPayloadAppend(OCRepPayload* parent, OCRepPayload* child) static OCRepPayloadValue* OCRepPayloadFindValue(const OCRepPayload* payload, const char* name) { - if(!payload || !name) + if (!payload || !name) { return NULL; } @@ -109,7 +109,7 @@ static OCRepPayloadValue* OCRepPayloadFindValue(const OCRepPayload* payload, con OCRepPayloadValue* val = payload->values; while(val) { - if(0 == strcmp(val->name, name)) + if (0 == strcmp(val->name, name)) { return val; } @@ -117,12 +117,11 @@ static OCRepPayloadValue* OCRepPayloadFindValue(const OCRepPayload* payload, con } return NULL; - } static void OCCopyPropertyValueArray(OCRepPayloadValue* dest, OCRepPayloadValue* source) { - if(!dest || !source) + if (!dest || !source) { return; } @@ -188,16 +187,16 @@ static void OCCopyPropertyValue (OCRepPayloadValue *dest, OCRepPayloadValue *sou static void OCFreeRepPayloadValueContents(OCRepPayloadValue* val) { - if(!val) + if (!val) { return; } - if(val->type == OCREP_PROP_STRING) + if (val->type == OCREP_PROP_STRING) { OICFree(val->str); } - else if(val->type == OCREP_PROP_BYTE_STRING) + else if (val->type == OCREP_PROP_BYTE_STRING) { OICFree(val->ocByteStr.bytes); } @@ -218,7 +217,7 @@ static void OCFreeRepPayloadValueContents(OCRepPayloadValue* val) OICFree(val->arr.iArray); break; case OCREP_PROP_STRING: - for(size_t i = 0; i< dimTotal;++i) + for(size_t i = 0; i< dimTotal; ++i) { OICFree(val->arr.strArray[i]); } @@ -232,7 +231,7 @@ static void OCFreeRepPayloadValueContents(OCRepPayloadValue* val) OICFree(val->arr.ocByteStrArray); break; case OCREP_PROP_OBJECT: - for(size_t i = 0; i< dimTotal;++i) + for(size_t i = 0; i< dimTotal; ++i) { OCRepPayloadDestroy(val->arr.objArray[i]); } @@ -249,7 +248,7 @@ static void OCFreeRepPayloadValueContents(OCRepPayloadValue* val) static void OCFreeRepPayloadValue(OCRepPayloadValue* val) { - if(!val) + if (!val) { return; } @@ -304,21 +303,21 @@ static OCRepPayloadValue* OCRepPayloadValueClone (OCRepPayloadValue* source) static OCRepPayloadValue* OCRepPayloadFindAndSetValue(OCRepPayload* payload, const char* name, OCRepPayloadPropType type) { - if(!payload || !name) + if (!payload || !name) { return NULL; } OCRepPayloadValue* val = payload->values; - if(val == NULL) + if (val == NULL) { payload->values = (OCRepPayloadValue*)OICCalloc(1, sizeof(OCRepPayloadValue)); - if(!payload->values) + if (!payload->values) { return NULL; } payload->values->name = OICStrdup(name); - if(!payload->values->name) + if (!payload->values->name) { OICFree(payload->values); payload->values = NULL; @@ -330,21 +329,21 @@ static OCRepPayloadValue* OCRepPayloadFindAndSetValue(OCRepPayload* payload, con while(val) { - if(0 == strcmp(val->name, name)) + if (0 == strcmp(val->name, name)) { OCFreeRepPayloadValueContents(val); val->type = type; return val; } - else if(val->next == NULL) + else if (val->next == NULL) { val->next = (OCRepPayloadValue*)OICCalloc(1, sizeof(OCRepPayloadValue)); - if(!val->next) + if (!val->next) { return NULL; } val->next->name = OICStrdup(name); - if(!val->next->name) + if (!val->next->name) { OICFree(val->next); val->next = NULL; @@ -368,12 +367,12 @@ bool OCRepPayloadAddResourceType(OCRepPayload* payload, const char* resourceType bool OCRepPayloadAddResourceTypeAsOwner(OCRepPayload* payload, char* resourceType) { - if(!payload || !resourceType) + if (!payload || !resourceType) { return false; } - if(payload->types) + if (payload->types) { OCStringLL* cur = payload->types; while(cur->next) @@ -382,7 +381,7 @@ bool OCRepPayloadAddResourceTypeAsOwner(OCRepPayload* payload, char* resourceTyp } cur->next = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL)); - if(!cur->next) + if (!cur->next) { return false; } @@ -393,7 +392,7 @@ bool OCRepPayloadAddResourceTypeAsOwner(OCRepPayload* payload, char* resourceTyp else { payload->types = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL)); - if(!payload->types) + if (!payload->types) { return false; } @@ -409,12 +408,12 @@ bool OCRepPayloadAddInterface(OCRepPayload* payload, const char* interface) bool OCRepPayloadAddInterfaceAsOwner(OCRepPayload* payload, char* interface) { - if(!payload || !interface) + if (!payload || !interface) { return false; } - if(payload->interfaces) + if (payload->interfaces) { OCStringLL* cur = payload->interfaces; while(cur->next) @@ -423,7 +422,7 @@ bool OCRepPayloadAddInterfaceAsOwner(OCRepPayload* payload, char* interface) } cur->next = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL)); - if(!cur->next) + if (!cur->next) { return false; } @@ -433,7 +432,7 @@ bool OCRepPayloadAddInterfaceAsOwner(OCRepPayload* payload, char* interface) else { payload->interfaces = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL)); - if(!payload->interfaces) + if (!payload->interfaces) { return false; } @@ -444,7 +443,7 @@ bool OCRepPayloadAddInterfaceAsOwner(OCRepPayload* payload, char* interface) bool OCRepPayloadSetUri(OCRepPayload* payload, const char* uri) { - if(!payload) + if (!payload) { return false; } @@ -457,7 +456,7 @@ bool OCRepPayloadIsNull(const OCRepPayload* payload, const char* name) { OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name); - if(!val) + if (!val) { return false; } @@ -469,7 +468,7 @@ static bool OCRepPayloadSetProp(OCRepPayload* payload, const char* name, void* value, OCRepPayloadPropType type) { OCRepPayloadValue* val = OCRepPayloadFindAndSetValue(payload, name, type); - if(!val) + if (!val) { return false; } @@ -518,7 +517,7 @@ bool OCRepPayloadGetPropInt(const OCRepPayload* payload, const char* name, int64 { OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name); - if(!val || val->type != OCREP_PROP_INT) + if (!val || val->type != OCREP_PROP_INT) { return false; } @@ -528,7 +527,7 @@ bool OCRepPayloadGetPropInt(const OCRepPayload* payload, const char* name, int64 } bool OCRepPayloadSetPropDouble(OCRepPayload* payload, - const char* name, double value) + const char* name, double value) { return OCRepPayloadSetProp(payload, name, &value, OCREP_PROP_DOUBLE); } @@ -537,7 +536,7 @@ bool OCRepPayloadGetPropDouble(const OCRepPayload* payload, const char* name, do { OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name); - if(!val || val->type != OCREP_PROP_DOUBLE) + if (!val || val->type != OCREP_PROP_DOUBLE) { return false; } @@ -551,7 +550,7 @@ bool OCRepPayloadSetPropString(OCRepPayload* payload, const char* name, const ch char* temp = OICStrdup(value); bool b = OCRepPayloadSetPropStringAsOwner(payload, name, temp); - if(!b) + if (!b) { OICFree(temp); } @@ -567,7 +566,7 @@ bool OCRepPayloadGetPropString(const OCRepPayload* payload, const char* name, ch { OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name); - if(!val || val->type != OCREP_PROP_STRING) + if (!val || val->type != OCREP_PROP_STRING) { return false; } @@ -587,7 +586,7 @@ bool OCRepPayloadSetPropByteString(OCRepPayload* payload, const char* name, OCBy .bytes = (uint8_t*)OICMalloc(value.len * sizeof(uint8_t)), .len = value.len }; - if(!ocByteStr.bytes) + if (!ocByteStr.bytes) { return false; } @@ -595,7 +594,7 @@ bool OCRepPayloadSetPropByteString(OCRepPayload* payload, const char* name, OCBy bool b = OCRepPayloadSetPropByteStringAsOwner(payload, name, &ocByteStr); - if(!b) + if (!b) { OICFree(ocByteStr.bytes); } @@ -633,7 +632,7 @@ bool OCRepPayloadGetPropByteString(const OCRepPayload* payload, const char* name } bool OCRepPayloadSetPropBool(OCRepPayload* payload, - const char* name, bool value) + const char* name, bool value) { return OCRepPayloadSetProp(payload, name, &value, OCREP_PROP_BOOL); } @@ -642,7 +641,7 @@ bool OCRepPayloadGetPropBool(const OCRepPayload* payload, const char* name, bool { OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name); - if(!val || val->type != OCREP_PROP_BOOL) + if (!val || val->type != OCREP_PROP_BOOL) { return false; } @@ -656,7 +655,7 @@ bool OCRepPayloadSetPropObject(OCRepPayload* payload, const char* name, const OC OCRepPayload* temp = OCRepPayloadClone(value); bool b = OCRepPayloadSetPropObjectAsOwner(payload, name, temp); - if(!b) + if (!b) { OCRepPayloadDestroy(temp); } @@ -672,7 +671,7 @@ bool OCRepPayloadGetPropObject(const OCRepPayload* payload, const char* name, OC { OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name); - if(!val || val->type != OCREP_PROP_OBJECT) + if (!val || val->type != OCREP_PROP_OBJECT) { return false; } @@ -683,7 +682,7 @@ bool OCRepPayloadGetPropObject(const OCRepPayload* payload, const char* name, OC size_t calcDimTotal(const size_t dimensions[MAX_REP_ARRAY_DEPTH]) { - if(dimensions[0] == 0) + if (dimensions[0] == 0) { return 0; } @@ -818,7 +817,7 @@ bool OCRepPayloadSetIntArrayAsOwner(OCRepPayload* payload, const char* name, { OCRepPayloadValue* val = OCRepPayloadFindAndSetValue(payload, name, OCREP_PROP_ARRAY); - if(!val) + if (!val) { return false; } @@ -834,14 +833,14 @@ bool OCRepPayloadSetIntArray(OCRepPayload* payload, const char* name, const int64_t* array, size_t dimensions[MAX_REP_ARRAY_DEPTH]) { size_t dimTotal = calcDimTotal(dimensions); - if(dimTotal == 0) + if (dimTotal == 0) { return false; } int64_t* newArray = (int64_t*)OICMalloc(dimTotal * sizeof(int64_t)); - if(!newArray) + if (!newArray) { return false; } @@ -850,7 +849,7 @@ bool OCRepPayloadSetIntArray(OCRepPayload* payload, const char* name, bool b = OCRepPayloadSetIntArrayAsOwner(payload, name, newArray, dimensions); - if(!b) + if (!b) { OICFree(newArray); } @@ -862,19 +861,19 @@ bool OCRepPayloadGetIntArray(const OCRepPayload* payload, const char* name, { OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name); - if(!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_INT + if (!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_INT || !val->arr.iArray) { return false; } size_t dimTotal = calcDimTotal(val->arr.dimensions); - if(dimTotal == 0) + if (dimTotal == 0) { return false; } *array = (int64_t*)OICMalloc(dimTotal * sizeof(int64_t)); - if(!*array) + if (!*array) { return false; } @@ -889,7 +888,7 @@ bool OCRepPayloadSetDoubleArrayAsOwner(OCRepPayload* payload, const char* name, { OCRepPayloadValue* val = OCRepPayloadFindAndSetValue(payload, name, OCREP_PROP_ARRAY); - if(!val) + if (!val) { return false; } @@ -904,14 +903,14 @@ bool OCRepPayloadSetDoubleArray(OCRepPayload* payload, const char* name, const double* array, size_t dimensions[MAX_REP_ARRAY_DEPTH]) { size_t dimTotal = calcDimTotal(dimensions); - if(dimTotal == 0) + if (dimTotal == 0) { return false; } double* newArray = (double*)OICMalloc(dimTotal * sizeof(double)); - if(!newArray) + if (!newArray) { return false; } @@ -919,7 +918,7 @@ bool OCRepPayloadSetDoubleArray(OCRepPayload* payload, const char* name, memcpy(newArray, array, dimTotal * sizeof(double)); bool b = OCRepPayloadSetDoubleArrayAsOwner(payload, name, newArray, dimensions); - if(!b) + if (!b) { OICFree(newArray); } @@ -931,19 +930,19 @@ bool OCRepPayloadGetDoubleArray(const OCRepPayload* payload, const char* name, { OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name); - if(!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_DOUBLE + if (!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_DOUBLE || !val->arr.dArray) { return false; } size_t dimTotal = calcDimTotal(val->arr.dimensions); - if(dimTotal == 0) + if (dimTotal == 0) { return false; } *array = (double*)OICMalloc(dimTotal * sizeof(double)); - if(!*array) + if (!*array) { return false; } @@ -958,7 +957,7 @@ bool OCRepPayloadSetStringArrayAsOwner(OCRepPayload* payload, const char* name, { OCRepPayloadValue* val = OCRepPayloadFindAndSetValue(payload, name, OCREP_PROP_ARRAY); - if(!val) + if (!val) { return false; } @@ -973,14 +972,14 @@ bool OCRepPayloadSetStringArray(OCRepPayload* payload, const char* name, const char** array, size_t dimensions[MAX_REP_ARRAY_DEPTH]) { size_t dimTotal = calcDimTotal(dimensions); - if(dimTotal == 0) + if (dimTotal == 0) { return false; } char** newArray = (char**)OICMalloc(dimTotal * sizeof(char*)); - if(!newArray) + if (!newArray) { return false; } @@ -992,7 +991,7 @@ bool OCRepPayloadSetStringArray(OCRepPayload* payload, const char* name, bool b = OCRepPayloadSetStringArrayAsOwner(payload, name, newArray, dimensions); - if(!b) + if (!b) { for(size_t i = 0; i < dimTotal; ++i) { @@ -1008,19 +1007,19 @@ bool OCRepPayloadGetStringArray(const OCRepPayload* payload, const char* name, { OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name); - if(!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_STRING + if (!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_STRING || !val->arr.strArray) { return false; } size_t dimTotal = calcDimTotal(val->arr.dimensions); - if(dimTotal == 0) + if (dimTotal == 0) { return false; } *array = (char**)OICMalloc(dimTotal * sizeof(char*)); - if(!*array) + if (!*array) { return false; } @@ -1042,7 +1041,7 @@ bool OCRepPayloadSetBoolArrayAsOwner(OCRepPayload* payload, const char* name, OCRepPayloadValue* val = OCRepPayloadFindAndSetValue(payload, name, OCREP_PROP_ARRAY); - if(!val) + if (!val) { return false; } @@ -1057,14 +1056,14 @@ bool OCRepPayloadSetBoolArray(OCRepPayload* payload, const char* name, const bool* array, size_t dimensions[MAX_REP_ARRAY_DEPTH]) { size_t dimTotal = calcDimTotal(dimensions); - if(dimTotal == 0) + if (dimTotal == 0) { return false; } bool* newArray = (bool*)OICMalloc(dimTotal * sizeof(bool)); - if(!newArray) + if (!newArray) { return false; } @@ -1073,7 +1072,7 @@ bool OCRepPayloadSetBoolArray(OCRepPayload* payload, const char* name, bool b = OCRepPayloadSetBoolArrayAsOwner(payload, name, newArray, dimensions); - if(!b) + if (!b) { OICFree(newArray); } @@ -1085,19 +1084,19 @@ bool OCRepPayloadGetBoolArray(const OCRepPayload* payload, const char* name, { OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name); - if(!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_BOOL + if (!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_BOOL || !val->arr.bArray) { return false; } size_t dimTotal = calcDimTotal(val->arr.dimensions); - if(dimTotal == 0) + if (dimTotal == 0) { return false; } *array = (bool*)OICMalloc(dimTotal * sizeof(bool)); - if(!*array) + if (!*array) { return false; } @@ -1112,7 +1111,7 @@ bool OCRepPayloadSetPropObjectArrayAsOwner(OCRepPayload* payload, const char* na { OCRepPayloadValue* val = OCRepPayloadFindAndSetValue(payload, name, OCREP_PROP_ARRAY); - if(!val) + if (!val) { return false; } @@ -1128,14 +1127,14 @@ bool OCRepPayloadSetPropObjectArray(OCRepPayload* payload, const char* name, const OCRepPayload** array, size_t dimensions[MAX_REP_ARRAY_DEPTH]) { size_t dimTotal = calcDimTotal(dimensions); - if(dimTotal == 0) + if (dimTotal == 0) { return false; } OCRepPayload** newArray = (OCRepPayload**)OICMalloc(dimTotal * sizeof(OCRepPayload*)); - if(!newArray) + if (!newArray) { return false; } @@ -1147,7 +1146,7 @@ bool OCRepPayloadSetPropObjectArray(OCRepPayload* payload, const char* name, bool b = OCRepPayloadSetPropObjectArrayAsOwner(payload, name, newArray, dimensions); - if(!b) + if (!b) { for(size_t i = 0; i < dimTotal; ++i) { @@ -1163,19 +1162,19 @@ bool OCRepPayloadGetPropObjectArray(const OCRepPayload* payload, const char* nam { OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name); - if(!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_OBJECT + if (!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_OBJECT || !val->arr.objArray) { return false; } size_t dimTotal = calcDimTotal(val->arr.dimensions); - if(dimTotal == 0) + if (dimTotal == 0) { return false; } *array = (OCRepPayload**)OICMalloc(dimTotal * sizeof(OCRepPayload*)); - if(!*array) + if (!*array) { return false; } @@ -1192,7 +1191,7 @@ bool OCRepPayloadGetPropObjectArray(const OCRepPayload* payload, const char* nam void OCFreeOCStringLL(OCStringLL* ll) { - if(!ll) + if (!ll) { return; } @@ -1263,7 +1262,7 @@ OCRepPayload* OCRepPayloadClone (const OCRepPayload* payload) void OCRepPayloadDestroy(OCRepPayload* payload) { - if(!payload) + if (!payload) { return; } @@ -1280,7 +1279,7 @@ OCDiscoveryPayload* OCDiscoveryPayloadCreate() { OCDiscoveryPayload* payload = (OCDiscoveryPayload*)OICCalloc(1, sizeof(OCDiscoveryPayload)); - if(!payload) + if (!payload) { return NULL; } @@ -1294,7 +1293,7 @@ OCSecurityPayload* OCSecurityPayloadCreate(const char* securityData) { OCSecurityPayload* payload = (OCSecurityPayload*)OICCalloc(1, sizeof(OCSecurityPayload)); - if(!payload) + if (!payload) { return NULL; } @@ -1307,7 +1306,7 @@ OCSecurityPayload* OCSecurityPayloadCreate(const char* securityData) void OCSecurityPayloadDestroy(OCSecurityPayload* payload) { - if(!payload) + if (!payload) { return; } @@ -1334,7 +1333,7 @@ OCResourcePayload* OCDiscoveryPayloadGetResource(OCDiscoveryPayload* payload, si OCResourcePayload* p = payload->resources; while(p) { - if(i == index) + if (i == index) { return p; } @@ -1347,14 +1346,14 @@ OCResourcePayload* OCDiscoveryPayloadGetResource(OCDiscoveryPayload* payload, si static OCResourcePayload* OCCopyResource(const OCResource* res, uint16_t port) { OCResourcePayload* pl = (OCResourcePayload*)OICCalloc(1, sizeof(OCResourcePayload)); - if(!pl) + if (!pl) { return NULL; } pl->uri = OICStrdup(res->uri); - if(!pl->uri) + if (!pl->uri) { FreeOCDiscoveryResource(pl); return NULL; @@ -1363,16 +1362,16 @@ static OCResourcePayload* OCCopyResource(const OCResource* res, uint16_t port) // types OCResourceType* typePtr = res->rsrcType; - if(typePtr != NULL) + if (typePtr != NULL) { pl->types = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL)); - if(!pl->types) + if (!pl->types) { FreeOCDiscoveryResource(pl); return NULL; } pl->types->value = OICStrdup(typePtr->resourcetypename); - if(!pl->types->value) + if (!pl->types->value) { FreeOCDiscoveryResource(pl); return NULL; @@ -1383,13 +1382,13 @@ static OCResourcePayload* OCCopyResource(const OCResource* res, uint16_t port) while(typePtr) { cur->next = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL)); - if(!cur->next) + if (!cur->next) { FreeOCDiscoveryResource(pl); return NULL; } cur->next->value = OICStrdup(typePtr->resourcetypename); - if(!cur->next->value) + if (!cur->next->value) { FreeOCDiscoveryResource(pl); return NULL; @@ -1401,16 +1400,16 @@ static OCResourcePayload* OCCopyResource(const OCResource* res, uint16_t port) // interfaces OCResourceInterface* ifPtr = res->rsrcInterface; - if(ifPtr != NULL) + if (ifPtr != NULL) { pl->interfaces = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL)); - if(!pl->interfaces) + if (!pl->interfaces) { FreeOCDiscoveryResource(pl); return NULL; } pl->interfaces->value = OICStrdup(ifPtr->name); - if(!pl->interfaces->value) + if (!pl->interfaces->value) { FreeOCDiscoveryResource(pl); return NULL; @@ -1421,13 +1420,13 @@ static OCResourcePayload* OCCopyResource(const OCResource* res, uint16_t port) while(ifPtr && cur) { cur->next = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL)); - if(!cur->next) + if (!cur->next) { FreeOCDiscoveryResource(pl); return NULL; } cur->next->value = OICStrdup(ifPtr->name); - if(!cur->next->value) + if (!cur->next->value) { FreeOCDiscoveryResource(pl); return NULL; @@ -1452,7 +1451,7 @@ void OCDiscoveryPayloadAddResource(OCDiscoveryPayload* payload, const OCResource bool OCResourcePayloadAddResourceType(OCResourcePayload* payload, const char* resourceType) { - if (!resourceType) + if (!resourceType || !payload) { return false; } @@ -1501,7 +1500,7 @@ bool OCResourcePayloadAddResourceType(OCResourcePayload* payload, const char* re bool OCResourcePayloadAddInterface(OCResourcePayload* payload, const char* interface) { - if (!interface) + if (!interface || !payload) { return false; } @@ -1550,7 +1549,12 @@ bool OCResourcePayloadAddInterface(OCResourcePayload* payload, const char* inter void OCDiscoveryPayloadAddNewResource(OCDiscoveryPayload* payload, OCResourcePayload* res) { - if(!payload->resources) + if (!payload) + { + return; + } + + if (!payload->resources) { payload->resources = res; } @@ -1567,7 +1571,7 @@ void OCDiscoveryPayloadAddNewResource(OCDiscoveryPayload* payload, OCResourcePay static void FreeOCDiscoveryResource(OCResourcePayload* payload) { - if(!payload) + if (!payload) { return; } @@ -1581,7 +1585,7 @@ static void FreeOCDiscoveryResource(OCResourcePayload* payload) } void OCDiscoveryPayloadDestroy(OCDiscoveryPayload* payload) { - if(!payload) + if (!payload) { return; } @@ -1596,17 +1600,17 @@ OCDevicePayload* OCDevicePayloadCreate(const uint8_t* sid, const char* dname, OCDevicePayload* payload = (OCDevicePayload*)OICCalloc(1, sizeof(OCDevicePayload)); - if(!payload) + if (!payload) { return NULL; } payload->base.type = PAYLOAD_TYPE_DEVICE; - if(sid) + if (sid) { payload->sid = (uint8_t*)OICMalloc(UUID_SIZE); - if(!payload->sid) + if (!payload->sid) { goto exit; } @@ -1614,19 +1618,19 @@ OCDevicePayload* OCDevicePayloadCreate(const uint8_t* sid, const char* dname, } payload->deviceName = OICStrdup(dname); - if(dname && !payload->deviceName) + if (dname && !payload->deviceName) { goto exit; } payload->specVersion = OICStrdup(specVer); - if(specVer && !payload->specVersion) + if (specVer && !payload->specVersion) { goto exit; } payload->dataModelVersion = OICStrdup(dmVer); - if(dmVer && !payload->dataModelVersion) + if (dmVer && !payload->dataModelVersion) { goto exit; } @@ -1640,7 +1644,7 @@ exit: void OCDevicePayloadDestroy(OCDevicePayload* payload) { - if(!payload) + if (!payload) { return; } @@ -1654,7 +1658,7 @@ void OCDevicePayloadDestroy(OCDevicePayload* payload) static void OCCopyPlatformInfo(const OCPlatformInfo* platformInfo, OCPlatformPayload* target) { - if(!platformInfo || !target) + if (!platformInfo || !target) { return; } @@ -1675,7 +1679,7 @@ static void OCCopyPlatformInfo(const OCPlatformInfo* platformInfo, OCPlatformPay OCPlatformPayload* OCPlatformPayloadCreateAsOwner(OCPlatformInfo* platformInfo) { OCPlatformPayload* payload = (OCPlatformPayload*)OICCalloc(1, sizeof(OCPlatformPayload)); - if(!payload) + if (!payload) { return NULL; } @@ -1690,7 +1694,7 @@ OCPlatformPayload* OCPlatformPayloadCreate(const OCPlatformInfo* platformInfo) { OCPlatformPayload* payload = (OCPlatformPayload*)OICCalloc(1, sizeof(OCPlatformPayload)); - if(!payload) + if (!payload) { return NULL; } @@ -1703,7 +1707,7 @@ OCPlatformPayload* OCPlatformPayloadCreate(const OCPlatformInfo* platformInfo) void OCPlatformPayloadDestroy(OCPlatformPayload* payload) { - if(!payload) + if (!payload) { return; } @@ -1726,7 +1730,7 @@ OCPresencePayload* OCPresencePayloadCreate(uint32_t seqNum, uint32_t maxAge, OCPresenceTrigger trigger, const char* resourceType) { OCPresencePayload* payload = (OCPresencePayload*)OICCalloc(1, sizeof(OCPresencePayload)); - if(!payload) + if (!payload) { return NULL; } @@ -1741,7 +1745,7 @@ OCPresencePayload* OCPresencePayloadCreate(uint32_t seqNum, uint32_t maxAge, void OCPresencePayloadDestroy(OCPresencePayload* payload) { - if(!payload) + if (!payload) { return; } diff --git a/resource/src/OCRepresentation.cpp b/resource/src/OCRepresentation.cpp index 2c91437..0de857c 100644 --- a/resource/src/OCRepresentation.cpp +++ b/resource/src/OCRepresentation.cpp @@ -43,6 +43,11 @@ namespace OC void MessageContainer::setPayload(const OCPayload* rep) { + if (rep == nullptr) + { + return; + } + switch(rep->type) { case PAYLOAD_TYPE_REPRESENTATION: @@ -62,9 +67,14 @@ namespace OC void MessageContainer::setPayload(const OCDevicePayload* payload) { + if (payload == nullptr) + { + return; + } + OCRepresentation rep; char uuidString[UUID_STRING_SIZE]; - if(payload->sid && RAND_UUID_OK == OCConvertUuidToString(payload->sid, uuidString)) + if (payload->sid && RAND_UUID_OK == OCConvertUuidToString(payload->sid, uuidString)) { rep[OC_RSRVD_DEVICE_ID] = std::string(uuidString); } @@ -86,6 +96,11 @@ namespace OC void MessageContainer::setPayload(const OCPlatformPayload* payload) { + if (payload == nullptr) + { + return; + } + OCRepresentation rep; rep[OC_RSRVD_PLATFORM_ID] = payload->info.platformID ? std::string(payload->info.platformID) : @@ -142,7 +157,7 @@ namespace OC OCRepPayload* root = nullptr; for(const auto& r : representations()) { - if(!root) + if (!root) { root = r.getPayload(); } @@ -364,7 +379,7 @@ namespace OC OCRepPayload* OCRepresentation::getPayload() const { OCRepPayload* root = OCRepPayloadCreate(); - if(!root) + if (!root) { throw std::bad_alloc(); } @@ -421,11 +436,11 @@ namespace OC size_t calcArrayDepth(const size_t dimensions[MAX_REP_ARRAY_DEPTH]) { - if(dimensions[0] == 0) + if (dimensions[0] == 0) { throw std::logic_error("invalid calcArrayDepth"); } - else if(dimensions[1] == 0) + else if (dimensions[1] == 0) { return 1; } @@ -487,7 +502,7 @@ namespace OC template void OCRepresentation::payload_array_helper(const OCRepPayloadValue* pl, size_t depth) { - if(depth == 1) + if (depth == 1) { std::vector val(pl->arr.dimensions[0]); @@ -735,7 +750,7 @@ namespace OC // child of a default or link item. // Our values array is only printed in the if we are the child of a Batch resource, // the parent in a 'default' situation, or not in a child/parent relationship. - if(!m_uri.empty()) + if (!m_uri.empty()) { return false; } @@ -746,7 +761,7 @@ namespace OC { return false; } - else if((m_interfaceType == InterfaceType::None + else if ((m_interfaceType == InterfaceType::None || m_interfaceType == InterfaceType::BatchChild || m_interfaceType == InterfaceType::DefaultParent) && m_values.size()>0) @@ -754,7 +769,7 @@ namespace OC return false; } - if(m_children.size() > 0) + if (m_children.size() > 0) { return false; } @@ -781,7 +796,7 @@ namespace OC { auto x = m_values.find(str); - if(m_values.end() != x) + if (m_values.end() != x) { return x->second.which() == AttributeValueNullIndex; } @@ -1003,7 +1018,7 @@ namespace OC OCRepresentation::iterator& OCRepresentation::iterator::operator++() { m_iterator++; - if(m_iterator != m_item.m_values.end()) + if (m_iterator != m_item.m_values.end()) { m_item.m_attrName = m_iterator->first; } @@ -1017,7 +1032,7 @@ namespace OC OCRepresentation::const_iterator& OCRepresentation::const_iterator::operator++() { m_iterator++; - if(m_iterator != m_item.m_values.end()) + if (m_iterator != m_item.m_values.end()) { m_item.m_attrName = m_iterator->first; } @@ -1095,7 +1110,7 @@ namespace OC std::string OCRepresentation::getValueToString(const std::string& key) const { auto x = m_values.find(key); - if(x != m_values.end()) + if (x != m_values.end()) { to_string_visitor vis; boost::apply_visitor(vis, x->second); @@ -1118,4 +1133,3 @@ namespace OC return os; } } -