Skip to content

Fixing MISRA violation 4.6, 10.4 #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 29, 2022
Merged

Fixing MISRA violation 4.6, 10.4 #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c8a2d68
Fixing MISRA violation 4.6, 10.4
xuelix Jul 27, 2022
43fb596
Fixing format check error
xuelix Jul 27, 2022
8f60005
Update test/Coverity/ConfigFiles/FreeRTOSConfig.h
xuelix Jul 28, 2022
5b7f0f6
fix formatting check error
xuelix Jul 28, 2022
144fd4b
Merge branch 'xueli/misra3' of https://github.com/xuelix/FreeRTOS-Plu…
xuelix Jul 28, 2022
d18a787
Uncrustify: triggered by comment.
actions-user Jul 28, 2022
75d7ccc
fix format check error
xuelix Jul 28, 2022
c47c931
Merge branch 'xueli/misra3' of https://github.com/xuelix/FreeRTOS-Plu…
xuelix Jul 28, 2022
594fecd
Remove snprintf cast
xuelix Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/FreeRTOS_IP_Utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,7 @@ const char * FreeRTOS_strerror_r( BaseType_t xErrnum,
/* MISRA Ref 21.6.1 [snprintf and logging] */
/* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-216 */
/* coverity[misra_c_2012_rule_21_6_violation] */
( void ) snprintf( pcBuffer, uxLength, "Errno %d", ( int ) xErrnum );
( void ) snprintf( pcBuffer, uxLength, "Errno %d", xErrnum );
pcName = NULL;
break;
}
Expand Down
8 changes: 4 additions & 4 deletions source/FreeRTOS_TCP_State_Handling.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@
uint8_t ucExpect = tcpTCP_FLAG_ACK;
const uint8_t ucFlagsMask = tcpTCP_FLAG_ACK | tcpTCP_FLAG_RST | tcpTCP_FLAG_SYN | tcpTCP_FLAG_FIN;

if( pxSocket->u.xTCP.eTCPState == ( uint8_t ) eCONNECT_SYN )
if( pxSocket->u.xTCP.eTCPState == eCONNECT_SYN )
{
ucExpect |= tcpTCP_FLAG_SYN;
}
Expand Down Expand Up @@ -405,7 +405,7 @@
pxTCPWindow->usPeerPortNumber = pxSocket->u.xTCP.usRemotePort;
pxTCPWindow->usOurPortNumber = pxSocket->usLocalPort;

if( pxSocket->u.xTCP.eTCPState == ( uint8_t ) eCONNECT_SYN )
if( pxSocket->u.xTCP.eTCPState == eCONNECT_SYN )
{
/* Map the Last packet onto the ProtocolHeader_t struct for easy access to the fields. */

Expand Down Expand Up @@ -452,7 +452,7 @@
}
#endif /* ipconfigUSE_TCP_WIN */

if( ( pxSocket->u.xTCP.eTCPState == ( EventBits_t ) eCONNECT_SYN ) || ( ulReceiveLength != 0U ) )
if( ( pxSocket->u.xTCP.eTCPState == eCONNECT_SYN ) || ( ulReceiveLength != 0U ) )
{
pxTCPHeader->ucTCPFlags = tcpTCP_FLAG_ACK;

Expand Down Expand Up @@ -735,7 +735,7 @@
* pucRecvData will point to the first byte of the TCP payload. */
ulReceiveLength = ( uint32_t ) prvCheckRxData( *ppxNetworkBuffer, &pucRecvData );

if( pxSocket->u.xTCP.eTCPState >= ( uint8_t ) eESTABLISHED )
if( pxSocket->u.xTCP.eTCPState >= eESTABLISHED )
{
if( pxTCPWindow->rx.ulCurrentSequenceNumber == ( ulSequenceNumber + 1U ) )
{
Expand Down
4 changes: 2 additions & 2 deletions test/Coverity/ConfigFiles/FreeRTOSConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
#define configUSE_IDLE_HOOK 1
#define configUSE_TICK_HOOK 1
#define configUSE_DAEMON_TASK_STARTUP_HOOK 1
#define configTICK_RATE_HZ ( 1000U ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */
#define configMINIMAL_STACK_SIZE ( 70 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the win32 thread. */
#define configTICK_RATE_HZ ( 1000U ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */
#define configMINIMAL_STACK_SIZE ( ( configSTACK_DEPTH_TYPE ) 70U ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the win32 thread. */
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 52 * 1024 ) )
#define configMAX_TASK_NAME_LEN ( 12 )
#define configUSE_TRACE_FACILITY 1
Expand Down