X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fsrc%2Fcamessagehandler.c;h=ebd322b480ec9e63ea3fb06360f7d6cfe45aed5d;hb=53427ddcd8a79536638ce85e61a6630a9e6b3139;hp=2abb1521694d976a68ec20c3bde63d1f58e44ecf;hpb=56c0e9f960c98b9bf833eb8141cd3ea726a079db;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/connectivity/src/camessagehandler.c b/resource/csdk/connectivity/src/camessagehandler.c index 2abb152..ebd322b 100755 --- a/resource/csdk/connectivity/src/camessagehandler.c +++ b/resource/csdk/connectivity/src/camessagehandler.c @@ -51,6 +51,8 @@ #define SINGLE_HANDLE #define MAX_THREAD_POOL_SIZE 20 +#define UNUSED(x) (void)(x) + // thread pool handle static ca_thread_pool_t g_threadPoolHandle = NULL; @@ -895,8 +897,7 @@ static void CAAdapterStateChangedCallback(CATransportAdapter_t transportType, bo static bool CAClearQueueEndpointDataContext(void *data, uint32_t size, void *ctx) { - (void)size; - + UNUSED(size); if (NULL == data || NULL == ctx) { return false; @@ -923,7 +924,7 @@ static void CAConnectionStateChangedCallback(const CAEndpoint_t *info, bool isCo { CAResult_t res = CAQueueingThreadClearContextData(&g_sendThread, CAClearQueueEndpointDataContext, - info); + (void *)info); if (CA_STATUS_OK != res) { OIC_LOG(ERROR, TAG, "Could not clear the send queue"); @@ -1174,8 +1175,8 @@ void CASetNetworkMonitorCallback(CANetworkMonitorCallback nwMonitorHandler) CAResult_t CAInitializeMessageHandler(CATransportAdapter_t transportType) { - CASetPacketReceivedCallback(CAReceivedPacketCallback); - CASetErrorHandleCallback(CAErrorHandler); + CASetPacketReceivedCallback((CANetworkPacketReceivedCallback)CAReceivedPacketCallback); + CASetErrorHandleCallback((CAErrorHandleCallback)CAErrorHandler); #ifndef SINGLE_THREAD // create thread pool @@ -1608,7 +1609,7 @@ static void CALogPDUInfo(const CAData_t *data, const coap_pdu_t *pdu) if (NULL != data->remoteEndpoint) { CALogAdapterTypeInfo(data->remoteEndpoint->adapter); - OIC_LOG_V(INFO, ANALYZER_TAG, "Address = [%s]:[%d]", data->remoteEndpoint->addr, + OIC_LOG_V(DEBUG, ANALYZER_TAG, "Address = [%s]:[%d]", data->remoteEndpoint->addr, data->remoteEndpoint->port); } @@ -1686,15 +1687,15 @@ static void CALogPDUInfo(const CAData_t *data, const coap_pdu_t *pdu) } size_t payloadLen = (pdu->data) ? (unsigned char *) pdu->hdr + pdu->length - pdu->data : 0; - OIC_LOG_V(INFO, ANALYZER_TAG, "CoAP Message Full Size = [%lu]", pdu->length); + OIC_LOG_V(INFO, ANALYZER_TAG, "CoAP Message Full Size = [%u]", pdu->length); OIC_LOG(INFO, ANALYZER_TAG, "CoAP Header (+ 0xFF)"); OIC_LOG_BUFFER(INFO, ANALYZER_TAG, (const uint8_t *) pdu->transport_hdr, pdu->length - payloadLen); - OIC_LOG_V(INFO, ANALYZER_TAG, "CoAP Header size = [%lu]", pdu->length - payloadLen); + OIC_LOG_V(INFO, ANALYZER_TAG, "CoAP Header size = [%" PRIuPTR "]", (size_t) pdu->length - payloadLen); OIC_LOG_V(INFO, ANALYZER_TAG, "CoAP Payload"); OIC_LOG_BUFFER(INFO_PRIVATE, ANALYZER_TAG, pdu->data, payloadLen); - OIC_LOG_V(INFO, ANALYZER_TAG, "CoAP Payload Size = [%lu]", payloadLen); + OIC_LOG_V(INFO, ANALYZER_TAG, "CoAP Payload Size = [%" PRIuPTR "]", payloadLen); OIC_LOG(INFO, ANALYZER_TAG, "================================================="); // samsung log @@ -1735,7 +1736,7 @@ static void CASamsungLogMessage(const CAData_t *data, const coap_pdu_t *pdu) if (NULL != data->remoteEndpoint) { int i = 0; - while (NULL != data->remoteEndpoint->addr[i]) + while (data->remoteEndpoint->addr[i]) { g_headerBuffer[g_headerIndex++] = data->remoteEndpoint->addr[i]; i++; @@ -1790,7 +1791,7 @@ static void CASamsungLogMessage(const CAData_t *data, const coap_pdu_t *pdu) if (info->resourceUri) { size_t i = 0; - while (NULL != info->resourceUri[i]) + while (info->resourceUri[i]) { g_headerBuffer[g_headerIndex++] = info->resourceUri[i]; i++;