Linting.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2213 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Source/event_groups.c b/FreeRTOS/Source/event_groups.c
index 1d24b3b3bd86b9ed065ef4fb6f138a4b0b0793e5..a9812df9d993661c580dd3a7369a0fe35a0322ab 100644 (file)
--- a/FreeRTOS/Source/event_groups.c
+++ b/FreeRTOS/Source/event_groups.c
@@ -106,7 +106,7 @@ taskEVENT_LIST_ITEM_VALUE_IN_USE definition. */
        #define eventEVENT_BITS_CONTROL_BYTES   0xff000000UL\r
 #endif\r
 \r
-typedef struct EVENT_GROUP_DEFINITION\r
+typedef struct xEventGroupDefinition\r
 {\r
        EventBits_t uxEventBits;\r
        List_t xTasksWaitingForBits;            /*< List of tasks waiting for a bit to be set. */\r
@@ -568,7 +568,7 @@ const List_t *pxTasksWaitingForBits = &( pxEventBits->xTasksWaitingForBits );
                        /* Unblock the task, returning 0 as the event list is being deleted\r
                        and     cannot therefore have any bits set. */\r
                        configASSERT( pxTasksWaitingForBits->xListEnd.pxNext != ( ListItem_t * ) &( pxTasksWaitingForBits->xListEnd ) );\r
-                       ( void ) xTaskRemoveFromUnorderedEventList( pxTasksWaitingForBits->xListEnd.pxNext, ( TickType_t ) eventUNBLOCKED_DUE_TO_BIT_SET );\r
+                       ( void ) xTaskRemoveFromUnorderedEventList( pxTasksWaitingForBits->xListEnd.pxNext, eventUNBLOCKED_DUE_TO_BIT_SET );\r
                }\r
 \r
                vPortFree( pxEventBits );\r
@@ -620,12 +620,12 @@ BaseType_t xWaitConditionMet = pdFALSE;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-#if (configUSE_TRACE_FACILITY == 1)\r
+#if ( ( configUSE_TRACE_FACILITY == 1 ) && ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) )\r
        BaseType_t xEventGroupSetBitsFromISR( EventGroupHandle_t xEventGroup, const EventBits_t uxBitsToSet, BaseType_t *pxHigherPriorityTaskWoken )\r
        {\r
        BaseType_t xReturn;\r
 \r
-               traceEVENT_GROUP_SET_BITS_FROM_ISR( xEventGroup, uxBitsToSet ); \r
+               traceEVENT_GROUP_SET_BITS_FROM_ISR( xEventGroup, uxBitsToSet );\r
                xReturn = xTimerPendFunctionCallFromISR( vEventGroupSetBitsCallback, ( void * ) xEventGroup, ( uint32_t ) uxBitsToSet, pxHigherPriorityTaskWoken );\r
 \r
                return xReturn;\r

diff --git a/FreeRTOS/Source/portable/MemMang/heap_4.c b/FreeRTOS/Source/portable/MemMang/heap_4.c
index 1fe5555659887c4046a828d4c4a45e3da7a466ed..6352bc9e7a3906ba482ae7abacc734a6c7301722 100644 (file)
--- a/FreeRTOS/Source/portable/MemMang/heap_4.c
+++ b/FreeRTOS/Source/portable/MemMang/heap_4.c
@@ -321,8 +321,8 @@ BlockLink_t *pxLink;
                                {\r
                                        /* Add this block to the list of free blocks. */\r
                                        xFreeBytesRemaining += pxLink->xBlockSize;\r
-                                       prvInsertBlockIntoFreeList( ( ( BlockLink_t * ) pxLink ) );\r
                                        traceFREE( pv, pxLink->xBlockSize );\r
+                                       prvInsertBlockIntoFreeList( ( ( BlockLink_t * ) pxLink ) );                                     \r
                                }\r
                                xTaskResumeAll();\r
                        }\r

diff --git a/FreeRTOS/Source/timers.c b/FreeRTOS/Source/timers.c
index c3cddd0e78a8151e7c72030f9d441edd84798106..5f77fb86a7a79772768e063157754851cf00e0d6 100644 (file)
--- a/FreeRTOS/Source/timers.c
+++ b/FreeRTOS/Source/timers.c
@@ -599,7 +599,7 @@ TickType_t xTimeNow;
 \r
                /* Commands that are positive are timer commands rather than pended\r
                function calls. */\r
-               if( xMessage.xMessageID >= 0 )\r
+               if( xMessage.xMessageID >= ( BaseType_t ) 0 )\r
                {\r
                        /* The messages uses the xTimerParameters member to work on a\r
                        software timer. */\r
@@ -805,7 +805,7 @@ Timer_t *pxTimer = ( Timer_t * ) xTimer;
        taskEXIT_CRITICAL();\r
 \r
        return xTimerIsInActiveList;\r
-}\r
+} /*lint !e818 Can't be pointer to const due to the typedef. */\r
 /*-----------------------------------------------------------*/\r
 \r
 void *pvTimerGetTimerID( const TimerHandle_t xTimer )\r