Skip to content

Commit 527a7c9

Browse files
tony-josi-awstony-josi-aws
authored
Merge pull request #1218 from tony-josi-aws/fix_issue_1217
Fix compiler warnings with optimizations enabled
2 parents df25226 + 5744911 commit 527a7c9

File tree

16 files changed

+116
-79
lines changed

16 files changed

+116
-79
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,32 @@ jobs:
207207
echo "::endgroup::"
208208
echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
209209
210+
- env:
211+
stepName: Build checks (Enable all functionalities with compiler optimization (speed) enabled)
212+
name: ${{ env.stepName }}
213+
run: |
214+
# ${{ env.stepName }}
215+
echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
216+
gcc --version
217+
cmake -S . -B build -DFREERTOS_PLUS_TCP_ENABLE_BUILD_CHECKS=ON -DFREERTOS_PLUS_TCP_TEST_CONFIGURATION=ENABLE_ALL -DCMAKE_C_FLAGS="-O3"
218+
cmake --build build --target freertos_plus_tcp_build_test
219+
220+
echo "::endgroup::"
221+
echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
222+
223+
- env:
224+
stepName: Build checks (Enable all functionalities with compiler optimization (size) enabled)
225+
name: ${{ env.stepName }}
226+
run: |
227+
# ${{ env.stepName }}
228+
echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
229+
230+
cmake -S . -B build -DFREERTOS_PLUS_TCP_ENABLE_BUILD_CHECKS=ON -DFREERTOS_PLUS_TCP_TEST_CONFIGURATION=ENABLE_ALL -DCMAKE_C_FLAGS="-Os"
231+
cmake --build build --target freertos_plus_tcp_build_test
232+
233+
echo "::endgroup::"
234+
echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
235+
210236
- env:
211237
stepName: Build checks (Enable all functionalities IPv4)
212238
name: ${{ env.stepName }}

‎source/FreeRTOS_DNS.c‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,14 @@ const MACAddress_t xMDNS_MacAddressIPv6 = { { 0x33, 0x33, 0x00, 0x00, 0x00, 0xFB
806806
uxExpectedPayloadLength = sizeof( DNSMessage_t ) +
807807
strlen( pcHostName ) +
808808
sizeof( uint16_t ) +
809-
sizeof( uint16_t ) + 2U;
809+
sizeof( uint16_t ) +
810+
2U; /* Accounts for the extra length fields
811+
* used while encoding the domain name being
812+
* queried into sequence of labels
813+
* (2 - length of the first label and ending NULL
814+
* byte; rest of the length fields placed in
815+
* the location of ASCII_BASELINE_DOT of the
816+
* respective labels). */
810817

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

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

15091516
/* Walk through the string to replace the '.' characters with byte
15101517
* counts. pucStart holds the address of the byte count. Walking the

‎source/FreeRTOS_DNS_Cache.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@
448448
/* Add or update the item. */
449449
if( strlen( pcName ) < ( size_t ) ipconfigDNS_CACHE_NAME_LENGTH )
450450
{
451-
( void ) strncpy( xDNSCache[ uxFreeEntry ].pcName, pcName, strlen( pcName ) );
451+
( void ) strncpy( xDNSCache[ uxFreeEntry ].pcName, pcName, ipconfigDNS_CACHE_NAME_LENGTH );
452452
( void ) memcpy( &( xDNSCache[ uxFreeEntry ].xAddresses[ 0 ] ), pxIP, sizeof( *pxIP ) );
453453

454454
xDNSCache[ uxFreeEntry ].ulTTL = ulTTL;

‎source/FreeRTOS_DNS_Callback.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
{
5959
BaseType_t xResult = pdFALSE;
6060
const ListItem_t * pxIterator;
61-
const ListItem_t * xEnd = listGET_END_MARKER( &xCallbackList );
61+
const ListItem_t * pxEnd = listGET_END_MARKER( &xCallbackList );
6262
TickType_t uxIdentifier = ( TickType_t ) pxSet->pxDNSMessageHeader->usIdentifier;
6363

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

7070
vTaskSuspendAll();
7171
{
72-
for( pxIterator = ( const ListItem_t * ) listGET_NEXT( xEnd );
73-
pxIterator != ( const ListItem_t * ) xEnd;
72+
for( pxIterator = ( const ListItem_t * ) listGET_HEAD_ENTRY( &xCallbackList );
73+
pxIterator != ( const ListItem_t * ) pxEnd;
7474
pxIterator = ( const ListItem_t * ) listGET_NEXT( pxIterator ) )
7575
{
7676
BaseType_t xMatching;
@@ -194,7 +194,7 @@
194194
void vDNSCheckCallBack( void * pvSearchID )
195195
{
196196
const ListItem_t * pxIterator;
197-
const ListItem_t * xEnd = listGET_END_MARKER( &xCallbackList );
197+
const ListItem_t * pxEnd = listGET_END_MARKER( &xCallbackList );
198198

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

207207
vTaskSuspendAll();
208208
{
209-
for( pxIterator = ( const ListItem_t * ) listGET_NEXT( xEnd );
210-
pxIterator != xEnd; )
209+
for( pxIterator = ( const ListItem_t * ) listGET_HEAD_ENTRY( &xCallbackList );
210+
pxIterator != pxEnd; )
211211
{
212212
DNSCallback_t * pxCallback = ( ( DNSCallback_t * ) listGET_LIST_ITEM_OWNER( pxIterator ) );
213213
/* Move to the next item because we might remove this item */
@@ -239,10 +239,10 @@
239239
if( listLIST_IS_EMPTY( &xTempList ) == pdFALSE )
240240
{
241241
/* There is at least one item in xTempList which must be removed and deleted. */
242-
xEnd = listGET_END_MARKER( &xTempList );
242+
pxEnd = listGET_END_MARKER( &xTempList );
243243

244-
for( pxIterator = ( const ListItem_t * ) listGET_NEXT( xEnd );
245-
pxIterator != xEnd;
244+
for( pxIterator = ( const ListItem_t * ) listGET_HEAD_ENTRY( &xTempList );
245+
pxIterator != pxEnd;
246246
)
247247
{
248248
DNSCallback_t * pxCallback = ( ( DNSCallback_t * ) listGET_LIST_ITEM_OWNER( pxIterator ) );

‎source/FreeRTOS_Sockets.c‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2285,7 +2285,7 @@ void * vSocketClose( FreeRTOS_Socket_t * pxSocket )
22852285

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

22902290
while( pxIterator != pxEnd )
22912291
{
@@ -2309,7 +2309,7 @@ void * vSocketClose( FreeRTOS_Socket_t * pxSocket )
23092309
}
23102310
else
23112311
{
2312-
for( pxIterator = listGET_NEXT( pxEnd );
2312+
for( pxIterator = listGET_HEAD_ENTRY( &xBoundTCPSocketsList );
23132313
pxIterator != pxEnd;
23142314
pxIterator = listGET_NEXT( pxIterator ) )
23152315
{
@@ -3054,7 +3054,7 @@ static const ListItem_t * pxListFindListItemWithValue( const List_t * pxList,
30543054
/* coverity[misra_c_2012_rule_11_3_violation] */
30553055
const ListItem_t * pxEnd = ( ( const ListItem_t * ) &( pxList->xListEnd ) );
30563056

3057-
for( pxIterator = listGET_NEXT( pxEnd );
3057+
for( pxIterator = listGET_HEAD_ENTRY( pxList );
30583058
pxIterator != pxEnd;
30593059
pxIterator = listGET_NEXT( pxIterator ) )
30603060
{
@@ -4961,7 +4961,7 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t * pxSocket )
49614961

49624962
( void ) ulLocalIP;
49634963

4964-
for( pxIterator = listGET_NEXT( pxEnd );
4964+
for( pxIterator = listGET_HEAD_ENTRY( &xBoundTCPSocketsList );
49654965
pxIterator != pxEnd;
49664966
pxIterator = listGET_NEXT( pxIterator ) )
49674967
{
@@ -6085,13 +6085,15 @@ BaseType_t FreeRTOS_GetIPType( ConstSocket_t xSocket )
60856085
{
60866086
const ListItem_t * pxIterator;
60876087
const ListItem_t * pxEnd;
6088+
const List_t * pxList;
60886089

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

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

6107-
for( pxIterator = listGET_NEXT( pxEnd );
6110+
for( pxIterator = listGET_HEAD_ENTRY( pxList );
61086111
pxIterator != pxEnd;
61096112
pxIterator = listGET_NEXT( pxIterator ) )
61106113
{

‎test/cbmc/proofs/DNS/CreateDNSMessage/Makefile.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[
88
"--unwind 1",
99
"--unwindset strlen.0:{HOSTNAME_UNWIND}",
10-
"--unwindset strncpy.0:{HOSTNAME_UNWIND}",
10+
"--unwindset strcpy.0:{HOSTNAME_UNWIND}",
1111
"--unwindset __CPROVER_file_local_FreeRTOS_DNS_c_prvCreateDNSMessage.0:{HOSTNAME_UNWIND}",
1212
"--unwindset __CPROVER_file_local_FreeRTOS_DNS_c_prvCreateDNSMessage.1:{HOSTNAME_UNWIND}",
1313
"--nondet-static"

‎test/cbmc/proofs/DNS/DNSTreatNBNS/Makefile.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
"ENTRY": "DNS_TreatNBNS",
33
"USE_CACHE":1,
44
"NBNS_NAME_MAX_LENGTH":17,
5+
"DNS_CACHE_NAME_LENGTH": 255,
56
"CBMCFLAGS":
67
[
78
"--unwind 1",
89
"--unwindset DNS_TreatNBNS.0:{NBNS_NAME_MAX_LENGTH}",
910
"--unwindset prvFindEntryIndex.0:2",
1011
"--unwindset strcmp.0:{NBNS_NAME_MAX_LENGTH}",
1112
"--unwindset strlen.0:{NBNS_NAME_MAX_LENGTH}",
12-
"--unwindset strncpy.0:{NBNS_NAME_MAX_LENGTH}"
13+
"--unwindset strncpy.0:{DNS_CACHE_NAME_LENGTH}"
1314
],
1415
"OBJS":
1516
[

‎test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_utest.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void test_xDNSDoCallback_success_not_equal_identifier( void )
118118
listGET_LIST_ITEM_OWNER_IgnoreAndReturn( ( DNSCallback_t * ) 1234 );
119119
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 ); /* xEnd */
120120
vTaskSuspendAll_Expect();
121-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
121+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
122122

123123
listGET_LIST_ITEM_VALUE_ExpectAnyArgsAndReturn( 12345 );
124124
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
@@ -149,7 +149,7 @@ void test_xDNSDoCallback_success_equal_identifier( void )
149149
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
150150

151151
vTaskSuspendAll_Expect();
152-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
152+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
153153

154154
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
155155
listGET_LIST_ITEM_VALUE_ExpectAnyArgsAndReturn( 123 );
@@ -183,7 +183,7 @@ void test_xDNSDoCallback_success_equal_identifier_set_timer( void )
183183
/* Expectations */
184184
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
185185
vTaskSuspendAll_Expect();
186-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
186+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
187187

188188
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
189189
listGET_LIST_ITEM_VALUE_ExpectAnyArgsAndReturn( 123 );
@@ -224,7 +224,7 @@ void test_xDNSDoCallback_success_equal_port_number_equal_name( void )
224224
/* Expectations */
225225
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
226226
vTaskSuspendAll_Expect();
227-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
227+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
228228

229229
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( pxDnsCallback );
230230
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );
@@ -264,7 +264,7 @@ void test_xDNSDoCallback_fail_equal_port_number_not_equal_name( void )
264264
/* Expectations */
265265
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
266266
vTaskSuspendAll_Expect();
267-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
267+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
268268

269269
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
270270
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
@@ -367,7 +367,7 @@ void test_vDNSCheckCallback_success_search_id_not_null( void )
367367
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
368368
vListInitialise_ExpectAnyArgs();
369369
vTaskSuspendAll_Expect();
370-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
370+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
371371
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
372372
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
373373
uxListRemove_ExpectAnyArgsAndReturn( pdFALSE );
@@ -395,7 +395,7 @@ void test_vDNSCheckCallback_success_search_id_not_null_list_empty( void )
395395
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
396396
vListInitialise_ExpectAnyArgs();
397397
vTaskSuspendAll_Expect();
398-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
398+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
399399
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
400400
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
401401
uxListRemove_ExpectAnyArgsAndReturn( pdFALSE );
@@ -422,7 +422,7 @@ void test_vDNSCheckCallback_success_search_id_null( void )
422422
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
423423
vListInitialise_ExpectAnyArgs();
424424
vTaskSuspendAll_Expect();
425-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
425+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
426426
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
427427
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
428428

@@ -454,7 +454,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout( void )
454454
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
455455
vListInitialise_ExpectAnyArgs();
456456
vTaskSuspendAll_Expect();
457-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
457+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
458458
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
459459
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
460460

@@ -466,7 +466,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout( void )
466466
listLIST_IS_EMPTY_ExpectAnyArgsAndReturn( pdFALSE );
467467

468468
listGET_END_MARKER_ExpectAnyArgsAndReturn( NULL );
469-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
469+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
470470
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
471471
listGET_NEXT_ExpectAnyArgsAndReturn( NULL ); /* end marker */
472472
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );
@@ -498,7 +498,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout_IPv6( void )
498498
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
499499
vListInitialise_ExpectAnyArgs();
500500
vTaskSuspendAll_Expect();
501-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
501+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
502502
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
503503
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
504504

@@ -510,7 +510,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout_IPv6( void )
510510
listLIST_IS_EMPTY_ExpectAnyArgsAndReturn( pdFALSE );
511511

512512
listGET_END_MARKER_ExpectAnyArgsAndReturn( NULL );
513-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
513+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
514514
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
515515
listGET_NEXT_ExpectAnyArgsAndReturn( NULL ); /* end marker */
516516
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );
@@ -542,7 +542,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout2( void )
542542
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
543543
vListInitialise_ExpectAnyArgs();
544544
vTaskSuspendAll_Expect();
545-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
545+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
546546
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
547547
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
548548

@@ -554,7 +554,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout2( void )
554554
listLIST_IS_EMPTY_ExpectAnyArgsAndReturn( pdFALSE );
555555

556556
listGET_END_MARKER_ExpectAnyArgsAndReturn( NULL );
557-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
557+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
558558
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
559559
listGET_NEXT_ExpectAnyArgsAndReturn( NULL ); /* end marker */
560560
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );
@@ -586,7 +586,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout2_IPv6( void )
586586
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
587587
vListInitialise_ExpectAnyArgs();
588588
vTaskSuspendAll_Expect();
589-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
589+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
590590
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
591591
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
592592

@@ -598,7 +598,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout2_IPv6( void )
598598
listLIST_IS_EMPTY_ExpectAnyArgsAndReturn( pdFALSE );
599599

600600
listGET_END_MARKER_ExpectAnyArgsAndReturn( NULL );
601-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
601+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
602602
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
603603
listGET_NEXT_ExpectAnyArgsAndReturn( NULL ); /* end marker */
604604
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );

0 commit comments

Comments
 (0)