github-forks
/
FreeRTOS-Kernel
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix MISRA C 2012 Rule 13.3 Violations (#988)

Browse Source 
* MISRA Rule 13.3 Fixes

* Add semiicolons that were accidentally removed

* Add parentheses back around pxList->uxNumberOfItems where removed.

* Formatting fix

* Add Casts to UBaseType_t

---------

Co-authored-by: bjbsmith <bjbsmith@uafeb6a6bcdce55.ant.amazon.com>
Co-authored-by: Rahul Kar <118818625+kar-rahul-aws@users.noreply.github.com>
Co-authored-by: Soren Ptak <ptaksoren@gmail.com>
pull/996/head
bradleysmith23 12 months ago committed by GitHub
parent 8c10944575
commit 4d34700bcc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File

24
include/list.h
Unescape Escape View File

@ -326,7 +326,7 @@ typedef struct xLIST
} \ } \
\ \
( pxItemToRemove )->pxContainer = NULL; \ ( pxItemToRemove )->pxContainer = NULL; \
( pxList->uxNumberOfItems )--; \ ( ( pxList )->uxNumberOfItems ) -= ( UBaseType_t ) 1U; \
} while( 0 ) } while( 0 )
/* /*
@ -363,17 +363,17 @@ typedef struct xLIST
\ \
/* Insert a new list item into ( pxList ), but rather than sort the list, \ /* Insert a new list item into ( pxList ), but rather than sort the list, \
* makes the new list item the last item to be removed by a call to \ * makes the new list item the last item to be removed by a call to \
* listGET_OWNER_OF_NEXT_ENTRY(). */ \ * listGET_OWNER_OF_NEXT_ENTRY(). */ \
( pxNewListItem )->pxNext = pxIndex; \ ( pxNewListItem )->pxNext = pxIndex; \
( pxNewListItem )->pxPrevious = pxIndex->pxPrevious; \ ( pxNewListItem )->pxPrevious = pxIndex->pxPrevious; \
\ \
pxIndex->pxPrevious->pxNext = ( pxNewListItem ); \ pxIndex->pxPrevious->pxNext = ( pxNewListItem ); \
pxIndex->pxPrevious = ( pxNewListItem ); \ pxIndex->pxPrevious = ( pxNewListItem ); \
\ \
/* Remember which list the item is in. */ \ /* Remember which list the item is in. */ \
( pxNewListItem )->pxContainer = ( pxList ); \ ( pxNewListItem )->pxContainer = ( pxList ); \
\ \
( ( pxList )->uxNumberOfItems )++; \ ( ( pxList )->uxNumberOfItems ) += ( UBaseType_t ) 1U; \
} while( 0 ) } while( 0 )
/* /*

9
list.c
Unescape Escape View File

@ -130,7 +130,7 @@ void vListInsertEnd( List_t * const pxList,
/* Remember which list the item is in. */ /* Remember which list the item is in. */
pxNewListItem->pxContainer = pxList; pxNewListItem->pxContainer = pxList;
( pxList->uxNumberOfItems )++; ( pxList->uxNumberOfItems ) += ( UBaseType_t ) 1U;
traceRETURN_vListInsertEnd(); traceRETURN_vListInsertEnd();
} }
@ -205,12 +205,13 @@ void vListInsert( List_t * const pxList,
* item later. */ * item later. */
pxNewListItem->pxContainer = pxList; pxNewListItem->pxContainer = pxList;
( pxList->uxNumberOfItems )++; ( pxList->uxNumberOfItems ) += ( UBaseType_t ) 1U;
traceRETURN_vListInsert(); traceRETURN_vListInsert();
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
UBaseType_t uxListRemove( ListItem_t * const pxItemToRemove ) UBaseType_t uxListRemove( ListItem_t * const pxItemToRemove )
{ {
/* The list item knows which list it is in. Obtain the list from the list /* The list item knows which list it is in. Obtain the list from the list
@ -219,8 +220,6 @@ UBaseType_t uxListRemove( ListItem_t * const pxItemToRemove )
traceENTER_uxListRemove( pxItemToRemove ); traceENTER_uxListRemove( pxItemToRemove );
pxItemToRemove->pxNext->pxPrevious = pxItemToRemove->pxPrevious; pxItemToRemove->pxNext->pxPrevious = pxItemToRemove->pxPrevious;
pxItemToRemove->pxPrevious->pxNext = pxItemToRemove->pxNext; pxItemToRemove->pxPrevious->pxNext = pxItemToRemove->pxNext;
@ -238,7 +237,7 @@ UBaseType_t uxListRemove( ListItem_t * const pxItemToRemove )
} }
pxItemToRemove->pxContainer = NULL; pxItemToRemove->pxContainer = NULL;
( pxList->uxNumberOfItems )--; ( pxList->uxNumberOfItems ) -= ( UBaseType_t ) 1U;
traceRETURN_uxListRemove( pxList->uxNumberOfItems ); traceRETURN_uxListRemove( pxList->uxNumberOfItems );

10
tasks.c
Unescape Escape View File

@ -255,7 +255,7 @@
pxTemp = pxDelayedTaskList; \ pxTemp = pxDelayedTaskList; \
pxDelayedTaskList = pxOverflowDelayedTaskList; \ pxDelayedTaskList = pxOverflowDelayedTaskList; \
pxOverflowDelayedTaskList = pxTemp; \ pxOverflowDelayedTaskList = pxTemp; \
xNumOfOverflows++; \ xNumOfOverflows += ( BaseType_t ) 1; \
prvResetNextTaskUnblockTime(); \ prvResetNextTaskUnblockTime(); \
} while( 0 ) } while( 0 )
@ -2021,7 +2021,7 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,
* updated. */ * updated. */
taskENTER_CRITICAL(); taskENTER_CRITICAL();
{ {
uxCurrentNumberOfTasks++; uxCurrentNumberOfTasks += ( UBaseType_t ) 1U;
if( pxCurrentTCB == NULL ) if( pxCurrentTCB == NULL )
{ {
@ -3815,7 +3815,7 @@ void vTaskSuspendAll( void )
/* The scheduler is suspended if uxSchedulerSuspended is non-zero. An increment /* The scheduler is suspended if uxSchedulerSuspended is non-zero. An increment
* is used to allow calls to vTaskSuspendAll() to nest. */ * is used to allow calls to vTaskSuspendAll() to nest. */
++uxSchedulerSuspended; uxSchedulerSuspended += ( UBaseType_t ) 1U;
/* Enforces ordering for ports and optimised compilers that may otherwise place /* Enforces ordering for ports and optimised compilers that may otherwise place
* the above increment elsewhere. */ * the above increment elsewhere. */
@ -3968,7 +3968,7 @@ BaseType_t xTaskResumeAll( void )
* previous call to vTaskSuspendAll(). */ * previous call to vTaskSuspendAll(). */
configASSERT( uxSchedulerSuspended != 0U ); configASSERT( uxSchedulerSuspended != 0U );
--uxSchedulerSuspended; uxSchedulerSuspended -= ( UBaseType_t ) 1U;
portRELEASE_TASK_LOCK(); portRELEASE_TASK_LOCK();
if( uxSchedulerSuspended == ( UBaseType_t ) 0U ) if( uxSchedulerSuspended == ( UBaseType_t ) 0U )
@ -4968,7 +4968,7 @@ BaseType_t xTaskIncrementTick( void )
} }
else else
{ {
++xPendedTicks; xPendedTicks += 1U;
/* The tick hook gets called at regular intervals, even if the /* The tick hook gets called at regular intervals, even if the
* scheduler is locked. */ * scheduler is locked. */

Write Preview
Loading…
Cancel
Save