From 39b08bd9fc59e89df96bae63367489a3562bcd2a Mon Sep 17 00:00:00 2001 From: richardbarry Date: Tue, 23 Jul 2013 09:53:24 +0000 Subject: [PATCH] Void a few unused return values and make casting more C++ friendly. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1995 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- FreeRTOS/Source/croutine.c | 10 +++++----- FreeRTOS/Source/include/semphr.h | 2 +- FreeRTOS/Source/queue.c | 8 ++++---- FreeRTOS/Source/tasks.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/FreeRTOS/Source/croutine.c b/FreeRTOS/Source/croutine.c index 207b5c1e8..f957aabdf 100644 --- a/FreeRTOS/Source/croutine.c +++ b/FreeRTOS/Source/croutine.c @@ -201,7 +201,7 @@ portTickType xTimeToWake; /* We must remove ourselves from the ready list before adding ourselves to the blocked list as the same list item is used for both lists. */ - uxListRemove( ( xListItem * ) &( pxCurrentCoRoutine->xGenericListItem ) ); + ( void ) uxListRemove( ( xListItem * ) &( pxCurrentCoRoutine->xGenericListItem ) ); /* The list item will be inserted in wake time order. */ listSET_LIST_ITEM_VALUE( &( pxCurrentCoRoutine->xGenericListItem ), xTimeToWake ); @@ -241,11 +241,11 @@ static void prvCheckPendingReadyList( void ) portDISABLE_INTERRUPTS(); { pxUnblockedCRCB = ( corCRCB * ) listGET_OWNER_OF_HEAD_ENTRY( (&xPendingReadyCoRoutineList) ); - uxListRemove( &( pxUnblockedCRCB->xEventListItem ) ); + ( void ) uxListRemove( &( pxUnblockedCRCB->xEventListItem ) ); } portENABLE_INTERRUPTS(); - uxListRemove( &( pxUnblockedCRCB->xGenericListItem ) ); + ( void ) uxListRemove( &( pxUnblockedCRCB->xGenericListItem ) ); prvAddCoRoutineToReadyQueue( pxUnblockedCRCB ); } } @@ -296,7 +296,7 @@ corCRCB *pxCRCB; /* Is the co-routine waiting on an event also? */ if( pxCRCB->xEventListItem.pvContainer ) { - uxListRemove( &( pxCRCB->xEventListItem ) ); + ( void ) uxListRemove( &( pxCRCB->xEventListItem ) ); } } portENABLE_INTERRUPTS(); @@ -368,7 +368,7 @@ signed portBASE_TYPE xReturn; event lists and the pending ready list. This function assumes that a check has already been made to ensure pxEventList is not empty. */ pxUnblockedCRCB = ( corCRCB * ) listGET_OWNER_OF_HEAD_ENTRY( pxEventList ); - uxListRemove( &( pxUnblockedCRCB->xEventListItem ) ); + ( void ) uxListRemove( &( pxUnblockedCRCB->xEventListItem ) ); vListInsertEnd( ( xList * ) &( xPendingReadyCoRoutineList ), &( pxUnblockedCRCB->xEventListItem ) ); if( pxUnblockedCRCB->uxPriority >= pxCurrentCoRoutine->uxPriority ) diff --git a/FreeRTOS/Source/include/semphr.h b/FreeRTOS/Source/include/semphr.h index 88e69dcd5..63706d3e5 100644 --- a/FreeRTOS/Source/include/semphr.h +++ b/FreeRTOS/Source/include/semphr.h @@ -121,7 +121,7 @@ typedef xQueueHandle xSemaphoreHandle; ( xSemaphore ) = xQueueGenericCreate( ( unsigned portBASE_TYPE ) 1, semSEMAPHORE_QUEUE_ITEM_LENGTH, queueQUEUE_TYPE_BINARY_SEMAPHORE ); \ if( ( xSemaphore ) != NULL ) \ { \ - xSemaphoreGive( ( xSemaphore ) ); \ + ( void ) xSemaphoreGive( ( xSemaphore ) ); \ } \ } diff --git a/FreeRTOS/Source/queue.c b/FreeRTOS/Source/queue.c index c587b1487..c5c1269e1 100644 --- a/FreeRTOS/Source/queue.c +++ b/FreeRTOS/Source/queue.c @@ -824,7 +824,7 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue; { /* Record the information required to implement priority inheritance should it become necessary. */ - pxQueue->pxMutexHolder = ( void * ) xTaskGetCurrentTaskHandle(); + pxQueue->pxMutexHolder = ( signed char * ) xTaskGetCurrentTaskHandle(); } } #endif @@ -1073,7 +1073,7 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue; { /* Record the information required to implement priority inheritance should it become necessary. */ - pxQueue->pxMutexHolder = ( void * ) xTaskGetCurrentTaskHandle(); /*lint !e961 Cast is not redundant as xTaskHandle is a typedef. */ + pxQueue->pxMutexHolder = ( signed char * ) xTaskGetCurrentTaskHandle(); /*lint !e961 Cast is not redundant as xTaskHandle is a typedef. */ } } #endif @@ -1742,7 +1742,7 @@ signed portBASE_TYPE xReturn; pxQueue->u.pcReadFrom = pxQueue->pcHead; } --( pxQueue->uxMessagesWaiting ); - memcpy( ( void * ) pvBuffer, ( void * ) pxQueue->u.pcReadFrom, ( unsigned ) pxQueue->uxItemSize ); + ( void ) memcpy( ( void * ) pvBuffer, ( void * ) pxQueue->u.pcReadFrom, ( unsigned ) pxQueue->uxItemSize ); xReturn = pdPASS; @@ -1822,7 +1822,7 @@ signed portBASE_TYPE xReturn; pxQueue->u.pcReadFrom = pxQueue->pcHead; } --( pxQueue->uxMessagesWaiting ); - memcpy( ( void * ) pvBuffer, ( void * ) pxQueue->u.pcReadFrom, ( unsigned ) pxQueue->uxItemSize ); + ( void ) memcpy( ( void * ) pvBuffer, ( void * ) pxQueue->u.pcReadFrom, ( unsigned ) pxQueue->uxItemSize ); if( ( *pxCoRoutineWoken ) == pdFALSE ) { diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c index 0c2513494..b280645b1 100644 --- a/FreeRTOS/Source/tasks.c +++ b/FreeRTOS/Source/tasks.c @@ -2182,7 +2182,7 @@ static portTASK_FUNCTION( prvIdleTask, pvParameters ) traceLOW_POWER_IDLE_END(); } } - xTaskResumeAll(); + ( void ) xTaskResumeAll(); } } #endif /* configUSE_TICKLESS_IDLE */ -- 2.39.5