From e0b257ce3d1ccc2204aa9537bd283810fa8c0e41 Mon Sep 17 00:00:00 2001 From: Sakthivel Samidurai Date: Mon, 19 Jan 2015 13:35:48 -0300 Subject: [PATCH] Fix build warnings Fix non-token build warnings in the stack. The token related build warnings are fixed in a separate commit. Change-Id: Ie43db965df3c434fc5a75b5949322505532bf796 Signed-off-by: Sakthivel Samidurai --- resource/csdk/stack/src/ocserverrequest.c | 2 +- resource/csdk/stack/src/ocstack.c | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/resource/csdk/stack/src/ocserverrequest.c b/resource/csdk/stack/src/ocserverrequest.c index 6ed8f7c..9b6a593 100644 --- a/resource/csdk/stack/src/ocserverrequest.c +++ b/resource/csdk/stack/src/ocserverrequest.c @@ -360,7 +360,7 @@ OCStackResult HandleSingleResponse(OCEntityHandlerResponse * ehResponse) OCServerRequest *serverRequest = (OCServerRequest *)ehResponse->requestHandle; // Copy the address - responseEndpoint.resourceUri = serverRequest->resourceUrl; + responseEndpoint.resourceUri = (CAURI_t)serverRequest->resourceUrl; responseEndpoint.addressInfo = serverRequest->addressInfo; responseEndpoint.connectivityType = serverRequest->connectivityType; responseEndpoint.isSecured = serverRequest->secured; diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c index 146ceb4..5db05bc 100644 --- a/resource/csdk/stack/src/ocstack.c +++ b/resource/csdk/stack/src/ocstack.c @@ -484,7 +484,7 @@ OCStackResult HandlePresenceResponse(const CARemoteEndpoint_t* endPoint, // This is the multicast case OCMulticastNode* mcNode = NULL; - mcNode = GetMCPresenceNode(fullUri); + mcNode = GetMCPresenceNode((const unsigned char *)fullUri); if(mcNode != NULL) { @@ -541,6 +541,7 @@ exit: OCFree(fullUri); OCFree(ipAddress); OCFree(resourceTypeName); +return result; } @@ -549,8 +550,6 @@ void HandleCAResponses(const CARemoteEndpoint_t* endPoint, const CAResponseInfo_ { OC_LOG(INFO, TAG, PCF("Enter HandleCAResponses")); - OCStackApplicationResult result = OC_STACK_DELETE_TRANSACTION; - if(NULL == endPoint) { OC_LOG(ERROR, TAG, PCF("endPoint is NULL")); @@ -628,10 +627,6 @@ void HandleCAResponses(const CARemoteEndpoint_t* endPoint, const CAResponseInfo_ //This function will be called back by CA layer when a request is received void HandleCARequests(const CARemoteEndpoint_t* endPoint, const CARequestInfo_t* requestInfo) { - CAInfo_t responseData; - CAResponseInfo_t responseInfo; - OCStackResult requestResult = OC_STACK_ERROR; - OC_LOG(INFO, TAG, PCF("Enter HandleCARequests")); #if 1 @@ -648,7 +643,6 @@ void HandleCARequests(const CARemoteEndpoint_t* endPoint, const CARequestInfo_t* char * newUri = (char *)endPoint->resourceUri; unsigned char * query = NULL; - unsigned char * resourceType = NULL; getQueryFromUri(endPoint->resourceUri, &query, &newUri); OC_LOG_V(INFO, TAG, PCF("**********URI without query ****: %s\n"), newUri); OC_LOG_V(INFO, TAG, PCF("**********Query ****: %s\n"), query); @@ -657,7 +651,7 @@ void HandleCARequests(const CARemoteEndpoint_t* endPoint, const CARequestInfo_t* //copy query if(query) { - memcpy (&(serverRequest.query), query, strlen(query)); + memcpy (&(serverRequest.query), query, strlen((char*)query)); } //copy request payload if (requestInfo->info.payload) @@ -755,7 +749,10 @@ void HandleCARequests(const CARemoteEndpoint_t* endPoint, const CARequestInfo_t* sizeof(CAHeaderOption_t)*requestInfo->info.numOptions); } - requestResult = HandleStackRequests (&serverRequest); + if(HandleStackRequests (&serverRequest) != OC_STACK_OK) + { + OC_LOG(INFO, TAG, PCF("HandleStackRequests failed")); + } #endif OC_LOG(INFO, TAG, PCF("Exit HandleCARequests")); @@ -1631,7 +1628,7 @@ OCStackResult OCDoResource(OCDoHandle *handle, OCMethod method, const char *requ caResult = CAGenerateToken(&caToken); //TODO-CA Remove this temporary fix (for some reason same token is being generated) - static count = 0; + static int count = 0; count++; caToken[0] += count; -- 2.7.4