Fix CBMC and UTs

tony-josi-aws · tony-josi-aws · commit 4125f33c1158 · 2025-01-27T15:27:23.000+05:30
diff --git a/source/FreeRTOS_Sockets.c b/source/FreeRTOS_Sockets.c
@@ -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_HEAD_ENTRY( ( const List_t * ) pxList );
+        for( pxIterator = listGET_HEAD_ENTRY( pxList );
              pxIterator != pxEnd;
              pxIterator = listGET_NEXT( pxIterator ) )
         {
@@ -6107,7 +6107,7 @@ BaseType_t FreeRTOS_GetIPType( ConstSocket_t xSocket )
                 }
             #endif /* ipconfigUSE_TCP == 1 */
 
-            for( pxIterator = listGET_HEAD_ENTRY( ( const List_t * ) pxList );
+            for( pxIterator = listGET_HEAD_ENTRY( pxList );
                  pxIterator != pxEnd;
                  pxIterator = listGET_NEXT( pxIterator ) )
             {
diff --git a/test/cbmc/proofs/DNS/DNSTreatNBNS/Makefile.json b/test/cbmc/proofs/DNS/DNSTreatNBNS/Makefile.json
@@ -2,7 +2,7 @@
   "ENTRY": "DNS_TreatNBNS",
   "USE_CACHE":1,
   "NBNS_NAME_MAX_LENGTH":17,
-  "DNS_CACHE_NAME_LENGTH": 254,
+  "DNS_CACHE_NAME_LENGTH": 255,
   "CBMCFLAGS":
   [
   	"--unwind 1",
diff --git a/test/unit-test/FreeRTOS_Sockets/Sockets_list_macros.h b/test/unit-test/FreeRTOS_Sockets/Sockets_list_macros.h
@@ -37,7 +37,7 @@ void listSET_LIST_ITEM_OWNER( ListItem_t * pxListItem,
                               void * owner );
 
 #undef listGET_HEAD_ENTRY
-ListItem_t * listGET_HEAD_ENTRY( List_t * pxList );
+ListItem_t * listGET_HEAD_ENTRY( const List_t * pxList );
 
 #undef listGET_END_MARKER
 ListItem_t * listGET_END_MARKER( List_t * pxList );
diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig/Sockets_DiffConfig_list_macros.h b/test/unit-test/FreeRTOS_Sockets_DiffConfig/Sockets_DiffConfig_list_macros.h
@@ -37,7 +37,7 @@ void listSET_LIST_ITEM_OWNER( ListItem_t * pxListItem,
                               void * owner );
 
 #undef listGET_HEAD_ENTRY
-ListItem_t * listGET_HEAD_ENTRY( List_t * pxList );
+ListItem_t * listGET_HEAD_ENTRY( const List_t * pxList );
 
 #undef listGET_END_MARKER
 ListItem_t * listGET_END_MARKER( List_t * pxList );
diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/Sockets_DiffConfig1_list_macros.h b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/Sockets_DiffConfig1_list_macros.h
@@ -37,7 +37,7 @@ void listSET_LIST_ITEM_OWNER( ListItem_t * pxListItem,
                               void * owner );
 
 #undef listGET_HEAD_ENTRY
-ListItem_t * listGET_HEAD_ENTRY( List_t * pxList );
+ListItem_t * listGET_HEAD_ENTRY( const List_t * pxList );
 
 #undef listGET_END_MARKER
 ListItem_t * listGET_END_MARKER( List_t * pxList );
diff --git a/test/unit-test/FreeRTOS_Sockets_IPv6/Sockets_IPv6_list_macros.h b/test/unit-test/FreeRTOS_Sockets_IPv6/Sockets_IPv6_list_macros.h
@@ -37,7 +37,7 @@ void listSET_LIST_ITEM_OWNER( ListItem_t * pxListItem,
                               void * owner );
 
 #undef listGET_HEAD_ENTRY
-ListItem_t * listGET_HEAD_ENTRY( List_t * pxList );
+ListItem_t * listGET_HEAD_ENTRY( const List_t * pxList );
 
 #undef listGET_END_MARKER
 ListItem_t * listGET_END_MARKER( List_t * pxList );
diff --git a/test/unit-test/FreeRTOS_TCP_IP/TCP_IP_list_macros.h b/test/unit-test/FreeRTOS_TCP_IP/TCP_IP_list_macros.h
@@ -34,7 +34,7 @@
 #include <list.h>
 
 #undef listGET_HEAD_ENTRY
-ListItem_t * listGET_HEAD_ENTRY( List_t * pxList );
+ListItem_t * listGET_HEAD_ENTRY( const List_t * pxList );
 
 #undef listSET_LIST_ITEM_OWNER
 void listSET_LIST_ITEM_OWNER( ListItem_t * pxListItem,

Original file line number	Diff line number	Diff line change
`@@ -3054,7 +3054,7 @@ static const ListItem_t * pxListFindListItemWithValue( const List_t * pxList,`
`3054`	`3054`	`/* coverity[misra_c_2012_rule_11_3_violation] */`
`3055`	`3055`	`const ListItem_t * pxEnd = ( ( const ListItem_t * ) &( pxList->xListEnd ) );`
`3056`	`3056`
`3057`		`- for( pxIterator = listGET_HEAD_ENTRY( ( const List_t * ) pxList );`
	`3057`	`+ for( pxIterator = listGET_HEAD_ENTRY( pxList );`
`3058`	`3058`	`pxIterator != pxEnd;`
`3059`	`3059`	`pxIterator = listGET_NEXT( pxIterator ) )`
`3060`	`3060`	`{`
`@@ -6107,7 +6107,7 @@ BaseType_t FreeRTOS_GetIPType( ConstSocket_t xSocket )`
`6107`	`6107`	`}`
`6108`	`6108`	`#endif /* ipconfigUSE_TCP == 1 */`
`6109`	`6109`
`6110`		`- for( pxIterator = listGET_HEAD_ENTRY( ( const List_t * ) pxList );`
	`6110`	`+ for( pxIterator = listGET_HEAD_ENTRY( pxList );`
`6111`	`6111`	`pxIterator != pxEnd;`
`6112`	`6112`	`pxIterator = listGET_NEXT( pxIterator ) )`
`6113`	`6113`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"ENTRY": "DNS_TreatNBNS",`
`3`	`3`	`"USE_CACHE":1,`
`4`	`4`	`"NBNS_NAME_MAX_LENGTH":17,`
`5`		`- "DNS_CACHE_NAME_LENGTH": 254,`
	`5`	`+ "DNS_CACHE_NAME_LENGTH": 255,`
`6`	`6`	`"CBMCFLAGS":`
`7`	`7`	`[`
`8`	`8`	`"--unwind 1",`