Skip to content

Fix compiler warnings with optimizations enabled #1218

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 12 commits into from
Jan 29, 2025
Merged

Fix compiler warnings with optimizations enabled #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
89be0fb
Update to use strcpy instead of strncpy
tony-josi-aws Jan 21, 2025
aaf0e1b
Add CI build with compiler optimizations
tony-josi-aws Jan 22, 2025
599849d
Fix CI
tony-josi-aws Jan 23, 2025
8101e7b
Fix CI
tony-josi-aws Jan 24, 2025
0782592
Fix CI
tony-josi-aws Jan 24, 2025
c973e61
Fix CBMC
tony-josi-aws Jan 27, 2025
07fa6b0
Check GCC version
tony-josi-aws Jan 27, 2025
43d9881
Fix false positive array-bounds warning
tony-josi-aws Jan 27, 2025
fa82f3f
Fix unit tests
tony-josi-aws Jan 27, 2025
4125f33
Fix CBMC and UTs
tony-josi-aws Jan 27, 2025
b727d62
Fix formatting
tony-josi-aws Jan 27, 2025
5744911
Merge branch 'main' into fix_issue_1217
amazonKamath Jan 29, 2025
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
26 changes: 26 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,32 @@ jobs:
echo "::endgroup::"
echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"

- env:
stepName: Build checks (Enable all functionalities with compiler optimization (speed) enabled)
name: ${{ env.stepName }}
run: |
# ${{ env.stepName }}
echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
gcc --version
cmake -S . -B build -DFREERTOS_PLUS_TCP_ENABLE_BUILD_CHECKS=ON -DFREERTOS_PLUS_TCP_TEST_CONFIGURATION=ENABLE_ALL -DCMAKE_C_FLAGS="-O3"
cmake --build build --target freertos_plus_tcp_build_test

echo "::endgroup::"
echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"

- env:
stepName: Build checks (Enable all functionalities with compiler optimization (size) enabled)
name: ${{ env.stepName }}
run: |
# ${{ env.stepName }}
echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"

cmake -S . -B build -DFREERTOS_PLUS_TCP_ENABLE_BUILD_CHECKS=ON -DFREERTOS_PLUS_TCP_TEST_CONFIGURATION=ENABLE_ALL -DCMAKE_C_FLAGS="-Os"
cmake --build build --target freertos_plus_tcp_build_test

echo "::endgroup::"
echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"

- env:
stepName: Build checks (Enable all functionalities IPv4)
name: ${{ env.stepName }}
Expand Down
11 changes: 9 additions & 2 deletions source/FreeRTOS_DNS.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,14 @@ const MACAddress_t xMDNS_MacAddressIPv6 = { { 0x33, 0x33, 0x00, 0x00, 0x00, 0xFB
uxExpectedPayloadLength = sizeof( DNSMessage_t ) +
strlen( pcHostName ) +
sizeof( uint16_t ) +
sizeof( uint16_t ) + 2U;
sizeof( uint16_t ) +
2U; /* Accounts for the extra length fields
* used while encoding the domain name being
* queried into sequence of labels
* (2 - length of the first label and ending NULL
* byte; rest of the length fields placed in
* the location of ASCII_BASELINE_DOT of the
* respective labels). */

/* Get a buffer. This uses a maximum delay, but the delay will be
* capped to ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS so the return value
Expand Down Expand Up @@ -1504,7 +1511,7 @@ const MACAddress_t xMDNS_MacAddressIPv6 = { { 0x33, 0x33, 0x00, 0x00, 0x00, 0xFB
uxIndex = uxStart + 1U;

/* Copy in the host name. */
( void ) strncpy( ( char * ) &( pucUDPPayloadBuffer[ uxIndex ] ), pcHostName, strlen( pcHostName ) + 1U );
( void ) strcpy( ( char * ) &( pucUDPPayloadBuffer[ uxIndex ] ), pcHostName );

/* Walk through the string to replace the '.' characters with byte
* counts. pucStart holds the address of the byte count. Walking the
Expand Down
2 changes: 1 addition & 1 deletion source/FreeRTOS_DNS_Cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@
/* Add or update the item. */
if( strlen( pcName ) < ( size_t ) ipconfigDNS_CACHE_NAME_LENGTH )
{
( void ) strncpy( xDNSCache[ uxFreeEntry ].pcName, pcName, strlen( pcName ) );
( void ) strncpy( xDNSCache[ uxFreeEntry ].pcName, pcName, ipconfigDNS_CACHE_NAME_LENGTH );
( void ) memcpy( &( xDNSCache[ uxFreeEntry ].xAddresses[ 0 ] ), pxIP, sizeof( *pxIP ) );

xDNSCache[ uxFreeEntry ].ulTTL = ulTTL;
Expand Down
18 changes: 9 additions & 9 deletions source/FreeRTOS_DNS_Callback.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
{
BaseType_t xResult = pdFALSE;
const ListItem_t * pxIterator;
const ListItem_t * xEnd = listGET_END_MARKER( &xCallbackList );
const ListItem_t * pxEnd = listGET_END_MARKER( &xCallbackList );
TickType_t uxIdentifier = ( TickType_t ) pxSet->pxDNSMessageHeader->usIdentifier;

/* While iterating through the list, the scheduler is suspended.
Expand All @@ -69,8 +69,8 @@

vTaskSuspendAll();
{
for( pxIterator = ( const ListItem_t * ) listGET_NEXT( xEnd );
pxIterator != ( const ListItem_t * ) xEnd;
for( pxIterator = ( const ListItem_t * ) listGET_HEAD_ENTRY( &xCallbackList );
pxIterator != ( const ListItem_t * ) pxEnd;
pxIterator = ( const ListItem_t * ) listGET_NEXT( pxIterator ) )
{
BaseType_t xMatching;
Expand Down Expand Up @@ -194,7 +194,7 @@
void vDNSCheckCallBack( void * pvSearchID )
{
const ListItem_t * pxIterator;
const ListItem_t * xEnd = listGET_END_MARKER( &xCallbackList );
const ListItem_t * pxEnd = listGET_END_MARKER( &xCallbackList );

/* When a DNS-search times out, the call-back function shall
* be called. Store theses item in a temporary list.
Expand All @@ -206,8 +206,8 @@

vTaskSuspendAll();
{
for( pxIterator = ( const ListItem_t * ) listGET_NEXT( xEnd );
pxIterator != xEnd; )
for( pxIterator = ( const ListItem_t * ) listGET_HEAD_ENTRY( &xCallbackList );
pxIterator != pxEnd; )
{
DNSCallback_t * pxCallback = ( ( DNSCallback_t * ) listGET_LIST_ITEM_OWNER( pxIterator ) );
/* Move to the next item because we might remove this item */
Expand Down Expand Up @@ -239,10 +239,10 @@
if( listLIST_IS_EMPTY( &xTempList ) == pdFALSE )
{
/* There is at least one item in xTempList which must be removed and deleted. */
xEnd = listGET_END_MARKER( &xTempList );
pxEnd = listGET_END_MARKER( &xTempList );

for( pxIterator = ( const ListItem_t * ) listGET_NEXT( xEnd );
pxIterator != xEnd;
for( pxIterator = ( const ListItem_t * ) listGET_HEAD_ENTRY( &xTempList );
pxIterator != pxEnd;
)
{
DNSCallback_t * pxCallback = ( ( DNSCallback_t * ) listGET_LIST_ITEM_OWNER( pxIterator ) );
Expand Down
13 changes: 8 additions & 5 deletions source/FreeRTOS_Sockets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2285,7 +2285,7 @@ void * vSocketClose( FreeRTOS_Socket_t * pxSocket )

if( pxSocketToDelete->u.xTCP.eTCPState == eTCP_LISTEN )
{
pxIterator = listGET_NEXT( pxEnd );
pxIterator = listGET_HEAD_ENTRY( &xBoundTCPSocketsList );

while( pxIterator != pxEnd )
{
Expand All @@ -2309,7 +2309,7 @@ void * vSocketClose( FreeRTOS_Socket_t * pxSocket )
}
else
{
for( pxIterator = listGET_NEXT( pxEnd );
for( pxIterator = listGET_HEAD_ENTRY( &xBoundTCPSocketsList );
pxIterator != pxEnd;
pxIterator = listGET_NEXT( pxIterator ) )
{
Expand Down Expand Up @@ -3054,7 +3054,7 @@ static const ListItem_t * pxListFindListItemWithValue( const List_t * pxList,
/* coverity[misra_c_2012_rule_11_3_violation] */
const ListItem_t * pxEnd = ( ( const ListItem_t * ) &( pxList->xListEnd ) );

for( pxIterator = listGET_NEXT( pxEnd );
for( pxIterator = listGET_HEAD_ENTRY( pxList );
pxIterator != pxEnd;
pxIterator = listGET_NEXT( pxIterator ) )
{
Expand Down Expand Up @@ -4961,7 +4961,7 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t * pxSocket )

( void ) ulLocalIP;

for( pxIterator = listGET_NEXT( pxEnd );
for( pxIterator = listGET_HEAD_ENTRY( &xBoundTCPSocketsList );
pxIterator != pxEnd;
pxIterator = listGET_NEXT( pxIterator ) )
{
Expand Down Expand Up @@ -6085,13 +6085,15 @@ BaseType_t FreeRTOS_GetIPType( ConstSocket_t xSocket )
{
const ListItem_t * pxIterator;
const ListItem_t * pxEnd;
const List_t * pxList;

if( xRound == 0 )
{
/* MISRA Ref 11.3.1 [Misaligned access] */
/* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */
/* coverity[misra_c_2012_rule_11_3_violation] */
pxEnd = ( ( const ListItem_t * ) &( xBoundUDPSocketsList.xListEnd ) );
pxList = &xBoundUDPSocketsList;
}

#if ipconfigUSE_TCP == 1
Expand All @@ -6101,10 +6103,11 @@ BaseType_t FreeRTOS_GetIPType( ConstSocket_t xSocket )
/* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */
/* coverity[misra_c_2012_rule_11_3_violation] */
pxEnd = ( ( const ListItem_t * ) &( xBoundTCPSocketsList.xListEnd ) );
pxList = &xBoundTCPSocketsList;
}
#endif /* ipconfigUSE_TCP == 1 */

for( pxIterator = listGET_NEXT( pxEnd );
for( pxIterator = listGET_HEAD_ENTRY( pxList );
pxIterator != pxEnd;
pxIterator = listGET_NEXT( pxIterator ) )
{
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/DNS/CreateDNSMessage/Makefile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[
"--unwind 1",
"--unwindset strlen.0:{HOSTNAME_UNWIND}",
"--unwindset strncpy.0:{HOSTNAME_UNWIND}",
"--unwindset strcpy.0:{HOSTNAME_UNWIND}",
"--unwindset __CPROVER_file_local_FreeRTOS_DNS_c_prvCreateDNSMessage.0:{HOSTNAME_UNWIND}",
"--unwindset __CPROVER_file_local_FreeRTOS_DNS_c_prvCreateDNSMessage.1:{HOSTNAME_UNWIND}",
"--nondet-static"
Expand Down
3 changes: 2 additions & 1 deletion test/cbmc/proofs/DNS/DNSTreatNBNS/Makefile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
"ENTRY": "DNS_TreatNBNS",
"USE_CACHE":1,
"NBNS_NAME_MAX_LENGTH":17,
"DNS_CACHE_NAME_LENGTH": 255,
"CBMCFLAGS":
[
"--unwind 1",
"--unwindset DNS_TreatNBNS.0:{NBNS_NAME_MAX_LENGTH}",
"--unwindset prvFindEntryIndex.0:2",
"--unwindset strcmp.0:{NBNS_NAME_MAX_LENGTH}",
"--unwindset strlen.0:{NBNS_NAME_MAX_LENGTH}",
"--unwindset strncpy.0:{NBNS_NAME_MAX_LENGTH}"
"--unwindset strncpy.0:{DNS_CACHE_NAME_LENGTH}"
],
"OBJS":
[
Expand Down
32 changes: 16 additions & 16 deletions test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_utest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void test_xDNSDoCallback_success_not_equal_identifier( void )
listGET_LIST_ITEM_OWNER_IgnoreAndReturn( ( DNSCallback_t * ) 1234 );
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 ); /* xEnd */
vTaskSuspendAll_Expect();
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );

listGET_LIST_ITEM_VALUE_ExpectAnyArgsAndReturn( 12345 );
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
Expand Down Expand Up @@ -149,7 +149,7 @@ void test_xDNSDoCallback_success_equal_identifier( void )
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );

vTaskSuspendAll_Expect();
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );

listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
listGET_LIST_ITEM_VALUE_ExpectAnyArgsAndReturn( 123 );
Expand Down Expand Up @@ -183,7 +183,7 @@ void test_xDNSDoCallback_success_equal_identifier_set_timer( void )
/* Expectations */
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
vTaskSuspendAll_Expect();
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );

listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
listGET_LIST_ITEM_VALUE_ExpectAnyArgsAndReturn( 123 );
Expand Down Expand Up @@ -224,7 +224,7 @@ void test_xDNSDoCallback_success_equal_port_number_equal_name( void )
/* Expectations */
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
vTaskSuspendAll_Expect();
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );

listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( pxDnsCallback );
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );
Expand Down Expand Up @@ -264,7 +264,7 @@ void test_xDNSDoCallback_fail_equal_port_number_not_equal_name( void )
/* Expectations */
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
vTaskSuspendAll_Expect();
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );

listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
Expand Down Expand Up @@ -367,7 +367,7 @@ void test_vDNSCheckCallback_success_search_id_not_null( void )
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
vListInitialise_ExpectAnyArgs();
vTaskSuspendAll_Expect();
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
uxListRemove_ExpectAnyArgsAndReturn( pdFALSE );
Expand Down Expand Up @@ -395,7 +395,7 @@ void test_vDNSCheckCallback_success_search_id_not_null_list_empty( void )
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
vListInitialise_ExpectAnyArgs();
vTaskSuspendAll_Expect();
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
uxListRemove_ExpectAnyArgsAndReturn( pdFALSE );
Expand All @@ -422,7 +422,7 @@ void test_vDNSCheckCallback_success_search_id_null( void )
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
vListInitialise_ExpectAnyArgs();
vTaskSuspendAll_Expect();
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */

Expand Down Expand Up @@ -454,7 +454,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout( void )
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
vListInitialise_ExpectAnyArgs();
vTaskSuspendAll_Expect();
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */

Expand All @@ -466,7 +466,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout( void )
listLIST_IS_EMPTY_ExpectAnyArgsAndReturn( pdFALSE );

listGET_END_MARKER_ExpectAnyArgsAndReturn( NULL );
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
listGET_NEXT_ExpectAnyArgsAndReturn( NULL ); /* end marker */
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );
Expand Down Expand Up @@ -498,7 +498,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout_IPv6( void )
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
vListInitialise_ExpectAnyArgs();
vTaskSuspendAll_Expect();
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */

Expand All @@ -510,7 +510,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout_IPv6( void )
listLIST_IS_EMPTY_ExpectAnyArgsAndReturn( pdFALSE );

listGET_END_MARKER_ExpectAnyArgsAndReturn( NULL );
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
listGET_NEXT_ExpectAnyArgsAndReturn( NULL ); /* end marker */
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );
Expand Down Expand Up @@ -542,7 +542,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout2( void )
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
vListInitialise_ExpectAnyArgs();
vTaskSuspendAll_Expect();
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */

Expand All @@ -554,7 +554,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout2( void )
listLIST_IS_EMPTY_ExpectAnyArgsAndReturn( pdFALSE );

listGET_END_MARKER_ExpectAnyArgsAndReturn( NULL );
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
listGET_NEXT_ExpectAnyArgsAndReturn( NULL ); /* end marker */
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );
Expand Down Expand Up @@ -586,7 +586,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout2_IPv6( void )
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
vListInitialise_ExpectAnyArgs();
vTaskSuspendAll_Expect();
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */

Expand All @@ -598,7 +598,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout2_IPv6( void )
listLIST_IS_EMPTY_ExpectAnyArgsAndReturn( pdFALSE );

listGET_END_MARKER_ExpectAnyArgsAndReturn( NULL );
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
listGET_NEXT_ExpectAnyArgsAndReturn( NULL ); /* end marker */
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );
Expand Down
Loading