From cc108d3d16dfeb586ec6c5c19f4ab850efd1cdfd Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Thu, 30 Jul 2015 23:20:03 -0700 Subject: [PATCH] Fix issues revealed by -Wextra flag. Fix assorted warnings raised by the -Wextra flag, including a few significant items. Reduced local build warnings from over 9200 warnings to about 650. At least one unicast send routine would drop all errors due to type issues. Change-Id: I9d8c90f83ccc89d9fba809f303ccf42b96c0eb82 Signed-off-by: Jon A. Cruz Reviewed-on: https://gerrit.iotivity.org/gerrit/2018 Tested-by: jenkins-iotivity Reviewed-by: Erich Keane --- examples/OICMiddle/LineInput.cpp | 14 ++- resource/csdk/connectivity/common/src/logger.c | 4 +- .../connectivity/common/src/oic_console_logger.c | 11 ++- .../csdk/connectivity/samples/linux/sample_main.c | 40 ++++---- .../connectivity/src/bt_edr_adapter/caedradapter.c | 7 +- .../src/bt_edr_adapter/linux/caedradapter.c | 32 ++++--- .../connectivity/src/bt_le_adapter/caleadapter.c | 7 +- .../csdk/connectivity/src/cablockwisetransfer.c | 15 ++- .../csdk/connectivity/src/cainterfacecontroller.c | 13 +-- resource/csdk/connectivity/src/camessagehandler.c | 13 +++ resource/csdk/connectivity/src/caprotocolmessage.c | 8 +- .../csdk/connectivity/src/ip_adapter/caipadapter.c | 6 ++ .../csdk/connectivity/src/ip_adapter/caipserver.c | 18 ++-- .../src/ip_adapter/linux/caipnwmonitor.c | 4 +- resource/include/OCRepresentation.h | 2 +- resource/include/OCResourceRequest.h | 2 +- resource/include/OCResourceResponse.h | 3 +- resource/include/OutOfProcClientWrapper.h | 102 +++++++++++---------- resource/include/OutOfProcServerWrapper.h | 51 ++++++----- resource/src/InProcServerWrapper.cpp | 4 +- resource/src/OCRepresentation.cpp | 8 +- 21 files changed, 218 insertions(+), 146 deletions(-) diff --git a/examples/OICMiddle/LineInput.cpp b/examples/OICMiddle/LineInput.cpp index 5fac3ed..184258b 100644 --- a/examples/OICMiddle/LineInput.cpp +++ b/examples/OICMiddle/LineInput.cpp @@ -115,7 +115,7 @@ LineResult LineInput::processLine(string command, stringstream& result, observec return processUnrecognized(elems, result); } -LineResult LineInput::processHelp(elements_t& elems, stringstream& ss) +LineResult LineInput::processHelp(elements_t& /*elems*/, stringstream& ss) { ss << "\nUsage:\n" "\tfind\t\tFind resources\n" @@ -138,7 +138,7 @@ LineResult LineInput::processUnrecognized(elements_t& elems, stringstream& ss) return LR_Unrecognized; } -LineResult LineInput::processFind(elements_t& elems, stringstream& ss) +LineResult LineInput::processFind(elements_t& /*elems*/, stringstream& /*ss*/) { m_client->findResources(); return LR_OK; @@ -155,7 +155,7 @@ void LineInput::registerResourceWithServer(std::string & url) { m_server->registerResource(url, resType, iface); } -LineResult LineInput::processShow(elements_t& elems, stringstream& ss) +LineResult LineInput::processShow(elements_t& /*elems*/, stringstream& ss) { int index = 0; m_resourceList.clear(); @@ -328,7 +328,7 @@ LineResult LineInput::processCancel(elements_t& elems, stringstream& ss) return LR_OK; } -WrapResource *LineInput::resolveResource(string resID, stringstream& ss) +WrapResource *LineInput::resolveResource(string resID, stringstream& /*ss*/) { size_t len; string useID = resID; @@ -351,7 +351,11 @@ WrapResource *LineInput::resolveResource(string resID, stringstream& ss) return it->second; } -void LineInput::obsCB(token_t token, const HeaderOptions& headerOptions, const OCRepresentation& rep, const int eCode, const int sequenceNumber) +void LineInput::obsCB(token_t /*token*/, + const HeaderOptions& /*headerOptions*/, + const OCRepresentation& /*rep*/, + const int eCode, + const int sequenceNumber) { if (!m_observer) return; diff --git a/resource/csdk/connectivity/common/src/logger.c b/resource/csdk/connectivity/common/src/logger.c index 4a8072b..c910dc9 100644 --- a/resource/csdk/connectivity/common/src/logger.c +++ b/resource/csdk/connectivity/common/src/logger.c @@ -157,7 +157,7 @@ void OICLog(LogLevel level, const char *tag, const char *logStr) int sec = 0; int ms = 0; #ifdef _POSIX_TIMERS - struct timespec when = {}; + struct timespec when = {0}; clockid_t clk = CLOCK_REALTIME; #ifdef CLOCK_REALTIME_COARSE clk = CLOCK_REALTIME_COARSE; @@ -455,4 +455,4 @@ void OICLogv(LogLevel level, const char *tag, const __FlashStringHelper *format, va_end(ap); } -#endif //ARDUINO \ No newline at end of file +#endif //ARDUINO diff --git a/resource/csdk/connectivity/common/src/oic_console_logger.c b/resource/csdk/connectivity/common/src/oic_console_logger.c index bbad2c1..aa13b00 100644 --- a/resource/csdk/connectivity/common/src/oic_console_logger.c +++ b/resource/csdk/connectivity/common/src/oic_console_logger.c @@ -38,9 +38,9 @@ oic_log_ctx_t *oic_make_console_logger() int oic_console_logger_init(oic_log_ctx_t *ctx, void *world) { - oic_console_logger_ctx *my_ctx; - - my_ctx = (oic_console_logger_ctx *) malloc(sizeof(oic_console_logger_ctx)); + (void)world; + oic_console_logger_ctx *my_ctx = + (oic_console_logger_ctx *) malloc(sizeof(oic_console_logger_ctx)); if (0 == my_ctx) return 0; @@ -70,6 +70,8 @@ void oic_console_logger_flush(oic_log_ctx_t *ctx) void oic_console_logger_set_level(oic_log_ctx_t *ctx, const int level) { + (void)ctx; + (void)level; /* We don't have any special thing we need to do when a log level changes. */ return; } @@ -88,7 +90,8 @@ size_t oic_console_logger_write(oic_log_ctx_t *ctx, const int level, const char int oic_console_logger_set_module(oic_log_ctx_t *ctx, const char *module_name) { + (void)ctx; + (void)module_name; /* We don't do anything special when the module name changes: */ return 1; } - diff --git a/resource/csdk/connectivity/samples/linux/sample_main.c b/resource/csdk/connectivity/samples/linux/sample_main.c index 1298f24..a5792d5 100644 --- a/resource/csdk/connectivity/samples/linux/sample_main.c +++ b/resource/csdk/connectivity/samples/linux/sample_main.c @@ -1,4 +1,4 @@ -/****************************************************************** +/* **************************************************************** * * Copyright 2014 Samsung Electronics All Rights Reserved. * @@ -94,7 +94,7 @@ void error_handler(const CAEndpoint_t *object, const CAErrorInfo_t* errorInfo); void send_response(const CAEndpoint_t *endpoint, const CAInfo_t *info); void get_resource_uri(char *URI, char *resourceURI, int length); int get_secure_information(CAPayload_t payLoad); -int get_address_set(const char *pAddress, addressSet_t* outAddress); +bool get_address_set(const char *pAddress, addressSet_t* outAddress); void parsing_coap_uri(const char* uri, addressSet_t* address, CATransportFlags_t *flags); CAHeaderOption_t* get_option_data(CAInfo_t* requestData); @@ -452,7 +452,7 @@ void send_request() CATransportFlags_t flags; printf("URI : %s\n", uri); - addressSet_t address = {}; + addressSet_t address = {{}, 0}; parsing_coap_uri(uri, &address, &flags); res = CACreateEndpoint(flags, g_selected_nw_type, @@ -767,7 +767,7 @@ void send_notification() int messageType = messageTypeBuf[0] - '0'; CATransportFlags_t flags; - addressSet_t address = {}; + addressSet_t address = {{}, 0}; parsing_coap_uri(uri, &address, &flags); // create remote endpoint @@ -955,8 +955,7 @@ void get_network_info() printf("################## Network Information #######################\n"); printf("Network info total size is %d\n\n", tempSize); - int index; - for (index = 0; index < tempSize; index++) + for (uint32_t index = 0; index < tempSize; index++) { printf("Type: %d\n", tempInfo[index].adapter); printf("Address: %s\n", tempInfo[index].addr); @@ -1105,6 +1104,7 @@ void response_handler(const CAEndpoint_t *object, const CAResponseInfo_t *respon void error_handler(const CAEndpoint_t *rep, const CAErrorInfo_t* errorInfo) { + (void)rep; printf("+++++++++++++++++++++++++++++++++++ErrorInfo+++++++++++++++++++++++++++++++++++\n"); if(errorInfo) @@ -1534,8 +1534,7 @@ void parsing_coap_uri(const char* uri, addressSet_t* address, CATransportFlags_t char *pAddress = cloneUri; printf("pAddress : %s\n", pAddress); - int res = get_address_set(pAddress, address); - if (res == -1) + if (!get_address_set(pAddress, address)) { printf("address parse error\n"); @@ -1546,23 +1545,23 @@ void parsing_coap_uri(const char* uri, addressSet_t* address, CATransportFlags_t return; } -int get_address_set(const char *pAddress, addressSet_t* outAddress) +bool get_address_set(const char *pAddress, addressSet_t* outAddress) { if (NULL == pAddress) { printf("parameter is null !\n"); - return -1; + return false; } - int32_t len = strlen(pAddress); - int32_t isIp = 0; - int32_t ipLen = 0; + size_t len = strlen(pAddress); + bool isIp = false; + size_t ipLen = 0; - for (int i = 0; i < len; i++) + for (size_t i = 0; i < len; i++) { if (pAddress[i] == '.') { - isIp = 1; + isIp = true; } // found port number start index @@ -1585,17 +1584,20 @@ int get_address_set(const char *pAddress, addressSet_t* outAddress) } else { - printf("IP Address too long: %d\n", ipLen==0 ? len : ipLen); - return -1; + printf("IP Address too long: %zu\n", (ipLen == 0) ? len : ipLen); + return false; } if (ipLen > 0) { outAddress->port = atoi(pAddress + ipLen + 1); } + return true; + } + else + { + return false; } - - return isIp; } void create_file(CAPayload_t bytes, size_t length) diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/caedradapter.c b/resource/csdk/connectivity/src/bt_edr_adapter/caedradapter.c index 8628cb9..5c17eba 100644 --- a/resource/csdk/connectivity/src/bt_edr_adapter/caedradapter.c +++ b/resource/csdk/connectivity/src/bt_edr_adapter/caedradapter.c @@ -707,6 +707,7 @@ void CAAdapterRecvData(const char *remoteAddress, const void *data, uint32_t dat void CAEDRErrorHandler(const char *remoteAddress, const char *serviceUUID, const void *data, uint32_t dataLength, CAResult_t result) { + (void)serviceUUID; OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN"); // Input validation @@ -918,8 +919,12 @@ void CAFreeEDRData(CAEDRData *edrData) void CAEDRDataDestroyer(void *data, uint32_t size) { + if ((size_t)size < sizeof(CAEDRData)) + { + OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "Destroy data too small %p %d", + data, size); + } CAEDRData *edrdata = (CAEDRData *) data; CAFreeEDRData(edrdata); } - diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/linux/caedradapter.c b/resource/csdk/connectivity/src/bt_edr_adapter/linux/caedradapter.c index 408c164..9304797 100644 --- a/resource/csdk/connectivity/src/bt_edr_adapter/linux/caedradapter.c +++ b/resource/csdk/connectivity/src/bt_edr_adapter/linux/caedradapter.c @@ -35,23 +35,25 @@ CAResult_t CAInitializeEDR(CARegisterConnectivityCallback registerCallback, CANetworkChangeCallback networkStateChangeCallback, CAErrorHandleCallback errorCallback, ca_thread_pool_t handle) { + (void)networkStateChangeCallback; + (void)errorCallback; OIC_LOG(DEBUG, TAG, "CAInitializeEDR"); g_edrReceivedCallback = reqRespCallback; g_threadPoolHandle = handle; // register handlers - CAConnectivityHandler_t handler = {}; - - handler.startAdapter = CAStartEDR; - handler.startListenServer = CAStartEDRListeningServer; - handler.startDiscoveryServer = CAStartEDRDiscoveryServer; - handler.sendData = CASendEDRUnicastData; - handler.sendDataToAll = CASendEDRMulticastData; - handler.GetnetInfo = CAGetEDRInterfaceInformation; - handler.readData = CAReadEDRData; - handler.stopAdapter = CAStopEDR; - handler.terminate = CATerminateEDR; + CAConnectivityHandler_t handler = { + .startAdapter = CAStartEDR, + .startListenServer = CAStartEDRListeningServer, + .startDiscoveryServer = CAStartEDRDiscoveryServer, + .sendData = CASendEDRUnicastData, + .sendDataToAll = CASendEDRMulticastData, + .GetnetInfo = CAGetEDRInterfaceInformation, + .readData = CAReadEDRData, + .stopAdapter = CAStopEDR, + .terminate = CATerminateEDR + }; registerCallback(handler, CA_ADAPTER_RFCOMM_BTEDR); @@ -82,6 +84,9 @@ CAResult_t CAStartEDRDiscoveryServer() int32_t CASendEDRUnicastData(const CAEndpoint_t *endpoint, const void *data, uint32_t dataLen) { + (void)endpoint; + (void)data; + (void)dataLen; OIC_LOG(DEBUG, TAG, "CASendEDRUnicastData"); return -1; @@ -89,6 +94,9 @@ int32_t CASendEDRUnicastData(const CAEndpoint_t *endpoint, const void *data, int32_t CASendEDRMulticastData(const CAEndpoint_t *endpoint, const void *data, uint32_t dataLen) { + (void)endpoint; + (void)data; + (void)dataLen; OIC_LOG(DEBUG, TAG, "CASendEDRMulticastData"); return -1; @@ -96,6 +104,8 @@ int32_t CASendEDRMulticastData(const CAEndpoint_t *endpoint, const void *data, u CAResult_t CAGetEDRInterfaceInformation(CAEndpoint_t **info, uint32_t *size) { + (void)info; + (void)size; OIC_LOG(DEBUG, TAG, "CAGetEDRInterfaceInformation"); return CA_STATUS_OK; diff --git a/resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c b/resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c index b0c548b..d44c3f6 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c @@ -1402,6 +1402,11 @@ static void CAFreeLEData(CALEData_t *bleData) static void CALEDataDestroyer(void *data, uint32_t size) { + if ((size_t)size < sizeof(CALEData_t *)) + { + OIC_LOG_V(ERROR, CALEADAPTER_TAG, + "Destroy data too small %p %d", data, size); + } CALEData_t *ledata = (CALEData_t *) data; CAFreeLEData(ledata); @@ -1925,7 +1930,7 @@ static void CALEDeviceStateChangedCb( CAAdapterState_t adapter_state) OIC_LOG(DEBUG, CALEADAPTER_TAG, "IN"); VERIFY_NON_NULL_VOID(g_localBLEAddress, CALEADAPTER_TAG, "g_localBLEAddress is null"); - CAEndpoint_t localEndpoint = {}; + CAEndpoint_t localEndpoint = {.adapter = CA_DEFAULT_ADAPTER}; ca_mutex_lock(g_bleLocalAddressMutex); OICStrcpy(localEndpoint.addr, sizeof(localEndpoint.addr), g_localBLEAddress); diff --git a/resource/csdk/connectivity/src/cablockwisetransfer.c b/resource/csdk/connectivity/src/cablockwisetransfer.c index 9444d98..46ea13c 100644 --- a/resource/csdk/connectivity/src/cablockwisetransfer.c +++ b/resource/csdk/connectivity/src/cablockwisetransfer.c @@ -248,6 +248,7 @@ CAResult_t CACheckBlockOptionType(CABlockData_t *currData) return CA_STATUS_OK; } +// TODO make pdu const after libcoap is updated to support that. CAResult_t CAReceiveBlockWiseData(coap_pdu_t *pdu, const CAEndpoint_t *endpoint, const CAData_t *receivedData, size_t dataLen) { @@ -735,6 +736,7 @@ CAResult_t CAReceiveLastBlock(const CABlockDataID_t *blockID, return CA_STATUS_OK; } +// TODO make pdu const after libcoap is updated to support that. CAResult_t CASetNextBlockOption1(coap_pdu_t *pdu, const CAEndpoint_t *endpoint, const CAData_t *receivedData, coap_block_t block, size_t dataLen) @@ -910,6 +912,7 @@ CAResult_t CASetNextBlockOption1(coap_pdu_t *pdu, const CAEndpoint_t *endpoint, return res; } +// TODO make pdu const after libcoap is updated to support that. CAResult_t CASetNextBlockOption2(coap_pdu_t *pdu, const CAEndpoint_t *endpoint, const CAData_t *receivedData, coap_block_t block, size_t dataLen) @@ -1204,7 +1207,8 @@ CAResult_t CAGetMoreBitFromBlock(size_t payloadLen, coap_block_t *block) { VERIFY_NON_NULL(block, TAG, "block"); - if (((block->num + 1) << (block->szx + BLOCK_NUMBER_IDX)) < payloadLen) + if ((size_t)((block->num + 1) << (block->szx + BLOCK_NUMBER_IDX)) + < payloadLen) { OIC_LOG(DEBUG, TAG, "Set the M-bit(1)"); block->m = 1; @@ -1713,6 +1717,7 @@ CAResult_t CAAddBlockSizeOption(coap_pdu_t *pdu, uint16_t sizeType, size_t dataL return CA_STATUS_OK; } +// TODO make pdu const after libcoap is updated to support that. bool CAIsPayloadLengthInPduWithBlockSizeOption(coap_pdu_t *pdu, uint16_t sizeType, size_t *totalPayloadLen) @@ -1764,7 +1769,8 @@ uint8_t CACheckBlockErrorType(CABlockData_t *currData, coap_block_t *receivedBlo if (COAP_OPTION_BLOCK1 == blockType) { size_t prePayloadLen = currData->receivedPayloadLen; - if (prePayloadLen != BLOCK_SIZE(receivedBlock->szx) * receivedBlock->num) + if (prePayloadLen != (size_t)BLOCK_SIZE(receivedBlock->szx) + * receivedBlock->num) { if (receivedBlock->num > currData->block1.num + 1) { @@ -1793,7 +1799,8 @@ uint8_t CACheckBlockErrorType(CABlockData_t *currData, coap_block_t *receivedBlo // #3. check if error check logic is required size_t optionLen = dataLen - blockPayloadLen; - if (receivedBlock->m && blockPayloadLen != BLOCK_SIZE(receivedBlock->szx)) + if (receivedBlock->m && blockPayloadLen != + (size_t)BLOCK_SIZE(receivedBlock->szx)) { // 413 Error handling of too large entity if (COAP_MAX_PDU_SIZE < BLOCK_SIZE(receivedBlock->szx) + optionLen) @@ -2458,7 +2465,7 @@ CABlockData_t *CACreateNewBlockData(const CAData_t *sendData) CABlockDataID_t* blockDataID = CACreateBlockDatablockId( token, tokenLength, data->sentData->remoteEndpoint->port); - if (NULL == blockDataID && NULL == blockDataID->id && blockDataID->idLength < 0) + if (NULL == blockDataID || NULL == blockDataID->id || blockDataID->idLength < 1) { OIC_LOG(ERROR, TAG, "blockId is null"); CADestroyBlockID(blockDataID); diff --git a/resource/csdk/connectivity/src/cainterfacecontroller.c b/resource/csdk/connectivity/src/cainterfacecontroller.c index 52c2f21..c90e070 100644 --- a/resource/csdk/connectivity/src/cainterfacecontroller.c +++ b/resource/csdk/connectivity/src/cainterfacecontroller.c @@ -368,14 +368,14 @@ CAResult_t CASendUnicastData(const CAEndpoint_t *endpoint, const void *data, uin return CA_STATUS_INVALID_PARAM; } - uint32_t sentDataLen = 0; + int32_t sentDataLen = 0; if (g_adapterHandler[index].sendData != NULL) { sentDataLen = g_adapterHandler[index].sendData(endpoint, data, length); } - if (sentDataLen != length) + if (sentDataLen != (int)length) { OIC_LOG(ERROR, TAG, "error in sending data. Error will be reported in adapter"); #ifdef SINGLE_THREAD @@ -400,8 +400,7 @@ CAResult_t CASendMulticastData(const CAEndpoint_t *endpoint, const void *data, u return CA_SEND_FAILED; } - int i = 0; - for (i = 0; i < u_arraylist_length(list); i++) + for (uint32_t i = 0; i < u_arraylist_length(list); i++) { void* ptrType = u_arraylist_get(list, i); @@ -461,8 +460,7 @@ CAResult_t CAStartListeningServerAdapters() return CA_STATUS_FAILED; } - int i = 0; - for (i = 0; i < u_arraylist_length(list); i++) + for (uint32_t i = 0; i < u_arraylist_length(list); i++) { void* ptrType = u_arraylist_get(list, i); @@ -502,8 +500,7 @@ CAResult_t CAStartDiscoveryServerAdapters() return CA_STATUS_FAILED; } - int i = 0; - for (i = 0; i < u_arraylist_length(list); i++) + for (uint32_t i = 0; i < u_arraylist_length(list); i++) { void* ptrType = u_arraylist_get(list, i); diff --git a/resource/csdk/connectivity/src/camessagehandler.c b/resource/csdk/connectivity/src/camessagehandler.c index c3dd036..f596167 100644 --- a/resource/csdk/connectivity/src/camessagehandler.c +++ b/resource/csdk/connectivity/src/camessagehandler.c @@ -298,6 +298,10 @@ static void CATimeoutCallback(const CAEndpoint_t *endpoint, const void *pdu, uin static void CADestroyData(void *data, uint32_t size) { OIC_LOG(DEBUG, TAG, "CADestroyData IN"); + if ((size_t)size < sizeof(CAData_t)) + { + OIC_LOG_V(ERROR, TAG, "Destroy data too small %p %d", data, size); + } CAData_t *cadata = (CAData_t *) data; if (NULL == cadata) @@ -380,6 +384,8 @@ static void CAReceiveThreadProcess(void *threadData) #ifndef SINGLE_HANDLE CAData_t *data = (CAData_t *) threadData; CAProcessReceivedData(data); +#else + (void)threadData; #endif OIC_LOG(DEBUG, TAG, "OUT"); } @@ -673,6 +679,8 @@ static void CAReceivedPacketCallback(const CAEndpoint_t *remoteEndpoint, const v static void CANetworkChangedCallback(const CAEndpoint_t *info, CANetworkStatus_t status) { + (void)info; + (void)status; OIC_LOG(DEBUG, TAG, "IN"); OIC_LOG(DEBUG, TAG, "OUT"); @@ -945,6 +953,11 @@ CAResult_t CADetachMessageResourceUri(const CAURI_t resourceUri, const CAToken_t uint8_t tokenLength, const CAHeaderOption_t *options, uint8_t numOptions) { + (void)resourceUri; + (void)token; + (void)tokenLength; + (void)options; + (void)numOptions; return CA_NOT_SUPPORTED; } diff --git a/resource/csdk/connectivity/src/caprotocolmessage.c b/resource/csdk/connectivity/src/caprotocolmessage.c index 37902d9..a375ef8 100644 --- a/resource/csdk/connectivity/src/caprotocolmessage.c +++ b/resource/csdk/connectivity/src/caprotocolmessage.c @@ -65,7 +65,7 @@ static const char COAP_URI_HEADER[] = "coap://[::]/"; -static uint32_t SEED = 0; +static unsigned int SEED = 0; CAResult_t CAGetRequestInfoFromPDU(const coap_pdu_t *pdu, CARequestInfo_t *outReqInfo) { @@ -301,6 +301,9 @@ coap_pdu_t *CAGeneratePDUImpl(code_t code, coap_list_t *options, const CAInfo_t { coap_add_data(pdu, payloadSize, (const unsigned char *) payload); } +#else + (void)payload; + (void)payloadSize; #endif OIC_LOG(DEBUG, TAG, "OUT"); @@ -431,6 +434,7 @@ CAResult_t CAParseUriPartial(const unsigned char *str, size_t length, int target CAResult_t CAParseHeadOption(uint32_t code, const CAInfo_t *info, coap_list_t **optlist) { + (void)code; OIC_LOG(DEBUG, TAG, "IN"); VERIFY_NON_NULL_RET(info, TAG, "info is NULL", CA_STATUS_INVALID_PARAM); @@ -820,7 +824,7 @@ CAResult_t CAGenerateTokenInternal(CAToken_t *token, uint8_t tokenLength) #else SEED = time(NULL); #endif - if (SEED == -1) + if (SEED == (unsigned int)((time_t)-1)) { OIC_LOG(ERROR, TAG, "seed is not made"); SEED = 0; diff --git a/resource/csdk/connectivity/src/ip_adapter/caipadapter.c b/resource/csdk/connectivity/src/ip_adapter/caipadapter.c index bba9e25..1579c03 100644 --- a/resource/csdk/connectivity/src/ip_adapter/caipadapter.c +++ b/resource/csdk/connectivity/src/ip_adapter/caipadapter.c @@ -145,6 +145,8 @@ void CAIPDeinitializeQueueHandles() void CAIPConnectionStateCB(const char *ipAddress, CANetworkStatus_t status) { + (void)ipAddress; + (void)status; OIC_LOG(DEBUG, TAG, "IN"); } @@ -528,6 +530,10 @@ void CAFreeIPData(CAIPData *ipData) void CADataDestroyer(void *data, uint32_t size) { + if (size < sizeof(CAIPData)) + { + OIC_LOG_V(ERROR, TAG, "Destroy data too small %p %d", data, size); + } CAIPData *etdata = (CAIPData *) data; CAFreeIPData(etdata); diff --git a/resource/csdk/connectivity/src/ip_adapter/caipserver.c b/resource/csdk/connectivity/src/ip_adapter/caipserver.c index cfaec22..be047bd 100644 --- a/resource/csdk/connectivity/src/ip_adapter/caipserver.c +++ b/resource/csdk/connectivity/src/ip_adapter/caipserver.c @@ -123,6 +123,7 @@ static CAResult_t CAReceiveMessage(int fd, CATransportFlags_t flags); static void CAReceiveHandler(void *data) { + (void)data; OIC_LOG(DEBUG, TAG, "IN"); while (!caglobals.ip.terminate) @@ -181,6 +182,7 @@ static void CAFindReadyMessage() static void CASelectReturned(fd_set *readFds, int ret) { + (void)ret; int fd = -1; CATransportFlags_t flags = CA_DEFAULT_FLAGS; @@ -228,7 +230,8 @@ static CAResult_t CAReceiveMessage(int fd, CATransportFlags_t flags) return CA_STATUS_FAILED; } - CAEndpoint_t ep = { CA_ADAPTER_IP, flags }; + CAEndpoint_t ep = { .adapter = CA_ADAPTER_IP, + .flags = flags }; if (flags & CA_IPV6) { @@ -286,7 +289,7 @@ static int CACreateSocket(int family, uint16_t *port) } #endif - struct sockaddr_storage sa = { family }; + struct sockaddr_storage sa = { .ss_family = family }; if (family == AF_INET6) { int on = 1; @@ -507,8 +510,8 @@ static void applyMulticastToInterface4(struct in_addr inaddr) return; } - struct ip_mreq mreq = { IPv4MulticastAddress }; - mreq.imr_interface = inaddr; + struct ip_mreq mreq = { .imr_multiaddr = IPv4MulticastAddress, + .imr_interface = inaddr}; if (setsockopt(caglobals.ip.m4.fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof (mreq))) { if (EADDRINUSE != errno) @@ -640,7 +643,7 @@ for (nh = (struct nlmsghdr *)buf; NLMSG_OK(nh, len); nh = NLMSG_NEXT(nh, len)) continue; } - if (ifitem->index != newIndex) + if ((int)ifitem->index != newIndex) { continue; } @@ -698,6 +701,9 @@ static void sendData(int fd, const CAEndpoint_t *endpoint, ssize_t len = sendto(fd, data, dlen, 0, (struct sockaddr *)&sock, sizeof (sock)); if (-1 == len) { + // If logging is not defined/enabled. + (void)cast; + (void)fam; OIC_LOG_V(ERROR, TAG, "%s%s %s sendTo failed: %s", secure, cast, fam, strerror(errno)); } else @@ -751,7 +757,7 @@ static void sendMulticastData4(const u_arraylist_t *iflist, CAEndpoint_t *endpoint, const void *data, uint32_t datalen) { - struct ip_mreq mreq = { IPv4MulticastAddress }; + struct ip_mreq mreq = { .imr_multiaddr = IPv4MulticastAddress }; OICStrcpy(endpoint->addr, sizeof(endpoint->addr), IPv4_MULTICAST); int fd = caglobals.ip.u4.fd; diff --git a/resource/csdk/connectivity/src/ip_adapter/linux/caipnwmonitor.c b/resource/csdk/connectivity/src/ip_adapter/linux/caipnwmonitor.c index 33a837f..f94b4f3 100644 --- a/resource/csdk/connectivity/src/ip_adapter/linux/caipnwmonitor.c +++ b/resource/csdk/connectivity/src/ip_adapter/linux/caipnwmonitor.c @@ -75,7 +75,9 @@ u_arraylist_t *CAIPGetInterfaceInformation(int desiredIndex) { CAInterface_t *ifitem = (CAInterface_t *)u_arraylist_get(iflist, i); - if (ifitem && ifitem->index == ifindex && ifitem->family == family) + if (ifitem + && (int)ifitem->index == ifindex + && ifitem->family == (uint16_t)family) { already = true; break; diff --git a/resource/include/OCRepresentation.h b/resource/include/OCRepresentation.h index b89b9fb..73d85c4 100644 --- a/resource/include/OCRepresentation.h +++ b/resource/include/OCRepresentation.h @@ -254,7 +254,7 @@ namespace OC return *this; } - AttributeItem& operator=(std::nullptr_t rhs) + AttributeItem& operator=(std::nullptr_t /*rhs*/) { NullType t; m_values[m_attrName] = t; diff --git a/resource/include/OCResourceRequest.h b/resource/include/OCResourceRequest.h index 962ddb2..004adf1 100644 --- a/resource/include/OCResourceRequest.h +++ b/resource/include/OCResourceRequest.h @@ -52,7 +52,7 @@ namespace OC m_queryParameters{}, m_requestHandlerFlag{}, m_representation{}, - m_observationInfo{}, + m_observationInfo{ObserveAction::ObserveRegister, 0}, m_headerOptions{}, m_requestHandle{nullptr}, m_resourceHandle{nullptr} diff --git a/resource/include/OCResourceResponse.h b/resource/include/OCResourceResponse.h index ea863ac..fbdd2c9 100644 --- a/resource/include/OCResourceResponse.h +++ b/resource/include/OCResourceResponse.h @@ -267,7 +267,7 @@ namespace OC * * @return OCEntityHandler result value */ - const OCEntityHandlerResult getResponseResult() const + OCEntityHandlerResult getResponseResult() const { return m_responseResult; } @@ -276,4 +276,3 @@ namespace OC } // namespace OC #endif //__OCRESOURCERESPONSE_H - diff --git a/resource/include/OutOfProcClientWrapper.h b/resource/include/OutOfProcClientWrapper.h index e524dfa..b8f63de 100644 --- a/resource/include/OutOfProcClientWrapper.h +++ b/resource/include/OutOfProcClientWrapper.h @@ -28,86 +28,94 @@ namespace OC class OutOfProcClientWrapper : public IClientWrapper { public: - OutOfProcClientWrapper(std::weak_ptr csdkLock, - PlatformConfig cfg) + OutOfProcClientWrapper(std::weak_ptr /*csdkLock*/, + PlatformConfig /*cfg*/) {} - virtual OCStackResult ListenForResource(const std::string& serviceUrl, - const std::string& resourceType, - OCConnectivityType connectivityType, - FindCallback& callback, QualityOfService QoS) + virtual OCStackResult ListenForResource(const std::string& /*servUrl*/, + const std::string& /*rsrcType*/, + OCConnectivityType /*connType*/, + FindCallback& /*callback*/, + QualityOfService /*QoS*/) {return OC_STACK_NOTIMPL;} - virtual OCStackResult ListenForDevice(const std::string& serviceUrl, - const std::string& deviceURI, - OCConnectivityType connectivityType, - FindDeviceCallback& callback, QualityOfService QoS) + virtual OCStackResult ListenForDevice(const std::string& /*serviceUrl*/, + const std::string& /*deviceURI*/, + OCConnectivityType /*connType*/, + FindDeviceCallback& /*callback*/, + QualityOfService /*QoS*/) {return OC_STACK_NOTIMPL;} - virtual OCStackResult ListenForDevice(const std::string& serviceUrl, - const std::string& deviceURI, FindDeviceCallback& callback, - QualityOfService QoS) + virtual OCStackResult ListenForDevice(const std::string& /*serviceUrl*/, + const std::string& /*deviceURI*/, + FindDeviceCallback& /*callback*/, + QualityOfService /*QoS*/) {return OC_STACK_NOTIMPL;} virtual OCStackResult GetResourceRepresentation( - const OCDevAddr& devAddr, - const std::string& uri, - const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, - GetCallback& callback, QualityOfService QoS) + const OCDevAddr& /*devAddr*/, + const std::string& /*uri*/, + const QueryParamsMap& /*queryParams*/, + const HeaderOptions& /*headerOptions*/, + GetCallback& /*callback*/, QualityOfService /*QoS*/) {return OC_STACK_NOTIMPL;} virtual OCStackResult PutResourceRepresentation( - const OCDevAddr& devAddr, - const std::string& uri, - const OCRepresentation& attributes, const QueryParamsMap& queryParams, - const HeaderOptions& headerOptions, PutCallback& callback, - QualityOfService QoS) + const OCDevAddr& /*devAddr*/, + const std::string& /*uri*/, + const OCRepresentation& /*attributes*/, + const QueryParamsMap& /*queryParams*/, + const HeaderOptions& /*headerOptions*/, + PutCallback& /*callback*/, + QualityOfService /*QoS*/) {return OC_STACK_NOTIMPL;} virtual OCStackResult PostResourceRepresentation( - const OCDevAddr& devAddr, - const std::string& uri, - const OCRepresentation& attributes, const QueryParamsMap& queryParams, - const HeaderOptions& headerOptions, PostCallback& callback, QualityOfService QoS) + const OCDevAddr& /*devAddr*/, + const std::string& /*uri*/, + const OCRepresentation& /*attributes*/, + const QueryParamsMap& /*queryParams*/, + const HeaderOptions& /*headerOptions*/, + PostCallback& /*callback*/, QualityOfService /*QoS*/) {return OC_STACK_NOTIMPL;} virtual OCStackResult DeleteResource( - const OCDevAddr& devAddr, - const std::string& uri, - const HeaderOptions& headerOptions, - DeleteCallback& callback, QualityOfService QoS) + const OCDevAddr& /*devAddr*/, + const std::string& /*uri*/, + const HeaderOptions& /*headerOptions*/, + DeleteCallback& /*callback*/, QualityOfService /*QoS*/) {return OC_STACK_NOTIMPL;} virtual OCStackResult ObserveResource( - ObserveType observeType, OCDoHandle* handle, - const OCDevAddr& devAddr, - const std::string& uri, - const QueryParamsMap& queryParams, const HeaderOptions& headerOptions, - ObserveCallback& callback, QualityOfService QoS) + ObserveType /*observeType*/, OCDoHandle* /*handle*/, + const OCDevAddr& /*devAddr*/, + const std::string& /*uri*/, + const QueryParamsMap& /*queryParams*/, + const HeaderOptions& /*headerOptions*/, + ObserveCallback& /*callback*/, QualityOfService /*QoS*/) {return OC_STACK_NOTIMPL;} virtual OCStackResult CancelObserveResource( - OCDoHandle handle, - const std::string& host, - const std::string& uri, - const HeaderOptions& headerOptions, QualityOfService QoS) + OCDoHandle /*handle*/, + const std::string& /*host*/, + const std::string& /*uri*/, + const HeaderOptions& /*headerOptions*/, QualityOfService /*QoS*/) {return OC_STACK_NOTIMPL;} virtual OCStackResult SubscribePresence( - OCDoHandle* handle, - const std::string& host, - const std::string& resourceType, - OCConnectivityType connectivityType, - SubscribeCallback& presenceHandler) + OCDoHandle* /*handle*/, + const std::string& /*host*/, + const std::string& /*resourceType*/, + OCConnectivityType /*connectivityType*/, + SubscribeCallback& /*presenceHandler*/) {return OC_STACK_NOTIMPL;} - virtual OCStackResult UnsubscribePresence(OCDoHandle handle) + virtual OCStackResult UnsubscribePresence(OCDoHandle /*handle*/) {return OC_STACK_NOTIMPL;} - virtual OCStackResult GetDefaultQos(QualityOfService& QoS) + virtual OCStackResult GetDefaultQos(QualityOfService& /*QoS*/) {return OC_STACK_NOTIMPL;} }; } #endif - diff --git a/resource/include/OutOfProcServerWrapper.h b/resource/include/OutOfProcServerWrapper.h index c9c364c..744a14c 100644 --- a/resource/include/OutOfProcServerWrapper.h +++ b/resource/include/OutOfProcServerWrapper.h @@ -28,73 +28,72 @@ namespace OC class OutOfProcServerWrapper : public IServerWrapper { public: - OutOfProcServerWrapper(PlatformConfig cfg) + OutOfProcServerWrapper(PlatformConfig /*cfg*/) {} virtual OCStackResult registerResource( - OCResourceHandle& resourceHandle, - std::string& resourceURI, - const std::string& resourceTypeName, - const std::string& resourceInterface, - EntityHandler& entityHandler, - uint8_t resourceProperty) - + OCResourceHandle& /*resourceHandle*/, + std::string& /*resourceURI*/, + const std::string& /*resourceTypeName*/, + const std::string& /*resourceInterface*/, + EntityHandler& /*entityHandler*/, + uint8_t /*resourceProperty*/) { // Not implemented return OC_STACK_NOTIMPL; } virtual OCStackResult registerDeviceInfo( - const OCDeviceInfo deviceInfo) + const OCDeviceInfo /*deviceInfo*/) { // Not implemented return OC_STACK_NOTIMPL; } virtual OCStackResult registerPlatformInfo( - const OCPlatformInfo deviceInfo) + const OCPlatformInfo /*deviceInfo*/) { // Not implemented return OC_STACK_NOTIMPL; } virtual OCStackResult registerResourceWithHost( - OCResourceHandle& resourceHandle, - std::string& resourceHOST, - std::string& resourceURI, - const std::string& resourceTypeName, - const std::string& resourceInterface, - EntityHandler& entityHandler, - uint8_t resourceProperty) + OCResourceHandle& /*resourceHandle*/, + std::string& /*resourceHOST*/, + std::string& /*resourceURI*/, + const std::string& /*resourceTypeName*/, + const std::string& /*resourceInterface*/, + EntityHandler& /*entityHandler*/, + uint8_t /*resourceProperty*/) { // Not implemented return OC_STACK_NOTIMPL; } virtual OCStackResult unregisterResource( - const OCResourceHandle& resourceHandle) + const OCResourceHandle& /*resourceHandle*/) { //Not implemented yet return OC_STACK_ERROR; } virtual OCStackResult bindTypeToResource( - const OCResourceHandle& resourceHandle, - const std::string& resourceTypeName) + const OCResourceHandle& /*resourceHandle*/, + const std::string& /*resourceTypeName*/) { //Not implemented yet return OC_STACK_NOTIMPL; } virtual OCStackResult bindInterfaceToResource( - const OCResourceHandle& resourceHandle, - const std::string& resourceInterfaceName) + const OCResourceHandle& /*resourceHandle*/, + const std::string& /*resourceInterfaceName*/) { //Not implemented yet return OC_STACK_NOTIMPL; } - virtual OCStackResult startPresence(const unsigned int seconds) + virtual OCStackResult startPresence(const unsigned int /*seconds*/) { //Not implemented yet return OC_STACK_NOTIMPL; @@ -106,13 +105,15 @@ namespace OC return OC_STACK_NOTIMPL; } - virtual OCStackResult setDefaultDeviceEntityHandler(EntityHandler entityHandler) + virtual OCStackResult setDefaultDeviceEntityHandler( + EntityHandler /*entityHandler*/) { //Not implemented yet return OC_STACK_NOTIMPL; } - virtual OCStackResult sendResponse(const std::shared_ptr pResponse) + virtual OCStackResult sendResponse( + const std::shared_ptr /*pResponse*/) { //Not implemented yet return OC_STACK_NOTIMPL; diff --git a/resource/src/InProcServerWrapper.cpp b/resource/src/InProcServerWrapper.cpp index e37022b..8a267b0 100644 --- a/resource/src/InProcServerWrapper.cpp +++ b/resource/src/InProcServerWrapper.cpp @@ -136,7 +136,7 @@ void formResourceRequest(OCEntityHandlerFlag flag, OCEntityHandlerResult DefaultEntityHandlerWrapper(OCEntityHandlerFlag flag, OCEntityHandlerRequest * entityHandlerRequest, char* uri, - void * callbackParam) + void * /*callbackParam*/) { OCEntityHandlerResult result = OC_EH_ERROR; @@ -176,7 +176,7 @@ OCEntityHandlerResult DefaultEntityHandlerWrapper(OCEntityHandlerFlag flag, OCEntityHandlerResult EntityHandlerWrapper(OCEntityHandlerFlag flag, OCEntityHandlerRequest * entityHandlerRequest, - void* callbackParam) + void* /*callbackParam*/) { OCEntityHandlerResult result = OC_EH_ERROR; diff --git a/resource/src/OCRepresentation.cpp b/resource/src/OCRepresentation.cpp index 998bdbe..df11e3c 100644 --- a/resource/src/OCRepresentation.cpp +++ b/resource/src/OCRepresentation.cpp @@ -171,7 +171,7 @@ namespace OC struct get_payload_array: boost::static_visitor<> { template - void operator()(T& arr) + void operator()(T& /*arr*/) { throw std::logic_error("Invalid calc_dimensions_visitor type"); } @@ -829,7 +829,7 @@ namespace OC type(AttributeType::Null), base_type(AttributeType::Null), depth(0){} template - void operator()(T const& item) + void operator()(T const& /*item*/) { type = type_info::enum_type; base_type = type_info::enum_base_type; @@ -1023,13 +1023,13 @@ namespace OC } template<> - void to_string_visitor::operator()(NullType const& item) + void to_string_visitor::operator()(NullType const& /*item*/) { str = "(null)"; } template<> - void to_string_visitor::operator()(OCRepresentation const& item) + void to_string_visitor::operator()(OCRepresentation const& /*item*/) { str = "OC::OCRepresentation"; } -- 2.7.4