Skip to content

Commit ed2791a

Browse files
committed
Fix formatting
1 parent 062135f commit ed2791a

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

test/cbmc/proofs/parsing/ProcessIPPacket/ProcessIPPacket_harness.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void harness()
158158
uint8_t * pucEthernetBuffer = ( uint8_t * ) safeMalloc( ipTOTAL_ETHERNET_FRAME_SIZE + ipIP_TYPE_OFFSET );
159159
EthernetHeader_t * pxHeader;
160160
NetworkEndPoint_t xEndPoint;
161-
161+
162162
__CPROVER_assume( pxNetworkBuffer != NULL );
163163
__CPROVER_assume( pucEthernetBuffer != NULL );
164164

@@ -168,15 +168,15 @@ void harness()
168168
__CPROVER_assume( pxNetworkBuffer->pucEthernetBuffer != NULL );
169169

170170
/* prvProcessIPPacket is guranteed to receive a network buffer that has a valid
171-
endpoint, hence no NULL checks are needed to be performed inside prvProcessIPPacket.
172-
See the check:
173-
174-
if( ( pxNetworkBuffer->pxInterface == NULL ) || ( pxNetworkBuffer->pxEndPoint == NULL ) )
175-
{
176-
break;
177-
}
178-
179-
inside the prvProcessEthernetPacket before which prvProcessIPPacket is called.
171+
* endpoint, hence no NULL checks are needed to be performed inside prvProcessIPPacket.
172+
* See the check:
173+
*
174+
* if( ( pxNetworkBuffer->pxInterface == NULL ) || ( pxNetworkBuffer->pxEndPoint == NULL ) )
175+
* {
176+
* break;
177+
* }
178+
*
179+
* inside the prvProcessEthernetPacket before which prvProcessIPPacket is called.
180180
*/
181181
pxNetworkBuffer->pxEndPoint = &xEndPoint;
182182

test/unit-test/FreeRTOS_ARP/FreeRTOS_ARP_utest.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2077,7 +2077,7 @@ void test_eARPGetCacheEntry_IPMatchesBroadcastAddr( void )
20772077
xIsIPv4Loopback_ExpectAndReturn( ulIPAddress, 0UL );
20782078
xIsIPv4Multicast_ExpectAndReturn( ulIPAddress, 0UL );
20792079
xIsIPv4Broadcast_ExpectAnyArgsAndReturn( 1UL );
2080-
xIsIPv4Broadcast_ReturnThruPtr_ppxEndPoint(&pxEndPoint2);
2080+
xIsIPv4Broadcast_ReturnThruPtr_ppxEndPoint( &pxEndPoint2 );
20812081

20822082
eResult = eARPGetCacheEntry( &ulIPAddress, &xMACAddress, &pxEndPoint );
20832083

@@ -2102,7 +2102,7 @@ void test_eARPGetCacheEntry_IPMatchesBroadcastAddr_NullEndPointOnNetMask( void )
21022102
xIsIPv4Loopback_ExpectAndReturn( ulIPAddress, 0UL );
21032103
xIsIPv4Multicast_ExpectAndReturn( ulIPAddress, 0UL );
21042104
xIsIPv4Broadcast_ExpectAnyArgsAndReturn( 1UL );
2105-
xIsIPv4Broadcast_ReturnThruPtr_ppxEndPoint(&pxEndPoint2);
2105+
xIsIPv4Broadcast_ReturnThruPtr_ppxEndPoint( &pxEndPoint2 );
21062106

21072107
eResult = eARPGetCacheEntry( &ulIPAddress, &xMACAddress, &pxEndPoint );
21082108

@@ -2155,14 +2155,14 @@ void test_eARPGetCacheEntry_IPMatchesOtherBroadcastAddr( void )
21552155
struct xNetworkInterface * xInterface;
21562156
struct xNetworkEndPoint * pxEndPoint, xEndPoint;
21572157
struct xNetworkEndPoint * pxEndPoint2 = &xEndPoint;
2158-
2158+
21592159
/* =================================================== */
21602160
ulIPAddress = FreeRTOS_ntohl( FREERTOS_INADDR_BROADCAST );
21612161
/* Not worried about what these functions do. */
21622162
xIsIPv4Loopback_ExpectAndReturn( ulIPAddress, 0UL );
21632163
xIsIPv4Multicast_ExpectAndReturn( ulIPAddress, 0UL );
21642164
xIsIPv4Broadcast_ExpectAnyArgsAndReturn( 1UL );
2165-
xIsIPv4Broadcast_ReturnThruPtr_ppxEndPoint(&pxEndPoint2);
2165+
xIsIPv4Broadcast_ReturnThruPtr_ppxEndPoint( &pxEndPoint2 );
21662166
eResult = eARPGetCacheEntry( &ulIPAddress, &xMACAddress, &pxEndPoint );
21672167
TEST_ASSERT_EQUAL_MESSAGE( eResolutionCacheHit, eResult, "Test 3" );
21682168
TEST_ASSERT_EQUAL_MEMORY_MESSAGE( &xBroadcastMACAddress, &xMACAddress, sizeof( xMACAddress ), "Test 3" );

test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void test_xIsIPv4Broadcast_BroadcastAddress( void )
131131
{
132132
BaseType_t xIsBroadcast;
133133
NetworkEndPoint_t xEndPoints[ 2 ]; /* IPv6->IPv4 */
134-
NetworkEndPoint_t *pxEndPoint = NULL;
134+
NetworkEndPoint_t * pxEndPoint = NULL;
135135

136136
memset( &xEndPoints[ 0 ], 0, sizeof( NetworkEndPoint_t ) );
137137
xEndPoints[ 0 ].bits.bIPv6 = pdTRUE;
@@ -142,15 +142,15 @@ void test_xIsIPv4Broadcast_BroadcastAddress( void )
142142
FreeRTOS_FirstEndPoint_ExpectAnyArgsAndReturn( &xEndPoints[ 0 ] );
143143
FreeRTOS_NextEndPoint_ExpectAndReturn( NULL, &xEndPoints[ 0 ], &xEndPoints[ 1 ] );
144144

145-
xIsBroadcast = xIsIPv4Broadcast(FREERTOS_INADDR_BROADCAST, &pxEndPoint);
145+
xIsBroadcast = xIsIPv4Broadcast( FREERTOS_INADDR_BROADCAST, &pxEndPoint );
146146

147147
TEST_ASSERT_EQUAL( pdTRUE, xIsBroadcast );
148148
TEST_ASSERT_EQUAL( &xEndPoints[ 1 ], pxEndPoint );
149149
}
150150

151151
/**
152152
* @brief test_xIsIPv4Broadcast_BroadcastAddressNoPtr
153-
* To validate if xIsIPv4Broadcast() when given broadcast address but
153+
* To validate if xIsIPv4Broadcast() when given broadcast address but
154154
* no input EP pointer.
155155
*/
156156
void test_xIsIPv4Broadcast_BroadcastAddressNoPtr( void )
@@ -167,22 +167,22 @@ void test_xIsIPv4Broadcast_BroadcastAddressNoPtr( void )
167167
FreeRTOS_FirstEndPoint_ExpectAnyArgsAndReturn( &xEndPoints[ 0 ] );
168168
FreeRTOS_NextEndPoint_ExpectAndReturn( NULL, &xEndPoints[ 0 ], &xEndPoints[ 1 ] );
169169

170-
xIsBroadcast = xIsIPv4Broadcast(FREERTOS_INADDR_BROADCAST, NULL);
170+
xIsBroadcast = xIsIPv4Broadcast( FREERTOS_INADDR_BROADCAST, NULL );
171171

172172
TEST_ASSERT_EQUAL( pdTRUE, xIsBroadcast );
173173
}
174174

175175
/**
176176
* @brief test_xIsIPv4Broadcast_BroadcastAddressNotFREERTOS_INADDR_BROADCAST
177-
* To validate if
178-
* test_xIsIPv4Broadcast_BroadcastAddressNotFREERTOS_INADDR_BROADCAST()
177+
* To validate if
178+
* test_xIsIPv4Broadcast_BroadcastAddressNotFREERTOS_INADDR_BROADCAST()
179179
* when given broadcast address but not FREERTOS_INADDR_BROADCAST.
180180
*/
181181
void test_xIsIPv4Broadcast_BroadcastAddressNotFREERTOS_INADDR_BROADCAST( void )
182182
{
183183
BaseType_t xIsBroadcast;
184184
NetworkEndPoint_t xEndPoints[ 2 ]; /* IPv6->IPv4 */
185-
NetworkEndPoint_t *pxEndPoint = NULL;
185+
NetworkEndPoint_t * pxEndPoint = NULL;
186186

187187
memset( &xEndPoints[ 0 ], 0, sizeof( NetworkEndPoint_t ) );
188188
xEndPoints[ 0 ].bits.bIPv6 = pdTRUE;
@@ -193,7 +193,7 @@ void test_xIsIPv4Broadcast_BroadcastAddressNotFREERTOS_INADDR_BROADCAST( void )
193193
FreeRTOS_FirstEndPoint_ExpectAnyArgsAndReturn( &xEndPoints[ 0 ] );
194194
FreeRTOS_NextEndPoint_ExpectAndReturn( NULL, &xEndPoints[ 0 ], &xEndPoints[ 1 ] );
195195

196-
xIsBroadcast = xIsIPv4Broadcast(0xFFFF1234, &pxEndPoint);
196+
xIsBroadcast = xIsIPv4Broadcast( 0xFFFF1234, &pxEndPoint );
197197

198198
TEST_ASSERT_EQUAL( pdTRUE, xIsBroadcast );
199199
TEST_ASSERT_EQUAL( &xEndPoints[ 1 ], pxEndPoint );
@@ -207,7 +207,7 @@ void test_xIsIPv4Broadcast_NotBroadcastAddress( void )
207207
{
208208
BaseType_t xIsBroadcast;
209209
NetworkEndPoint_t xEndPoints[ 2 ]; /* IPv6->IPv4 */
210-
NetworkEndPoint_t *pxEndPoint = NULL;
210+
NetworkEndPoint_t * pxEndPoint = NULL;
211211

212212
memset( &xEndPoints[ 0 ], 0, sizeof( NetworkEndPoint_t ) );
213213
xEndPoints[ 0 ].bits.bIPv6 = pdTRUE;
@@ -219,7 +219,7 @@ void test_xIsIPv4Broadcast_NotBroadcastAddress( void )
219219
FreeRTOS_NextEndPoint_ExpectAndReturn( NULL, &xEndPoints[ 0 ], &xEndPoints[ 1 ] );
220220
FreeRTOS_NextEndPoint_ExpectAndReturn( NULL, &xEndPoints[ 1 ], NULL );
221221

222-
xIsBroadcast = xIsIPv4Broadcast(0xABCD1235, &pxEndPoint);
222+
xIsBroadcast = xIsIPv4Broadcast( 0xABCD1235, &pxEndPoint );
223223

224224
TEST_ASSERT_EQUAL( pdFALSE, xIsBroadcast );
225225
TEST_ASSERT_EQUAL( NULL, pxEndPoint );
@@ -232,28 +232,28 @@ void test_xIsIPv4Broadcast_NotBroadcastAddress( void )
232232
void test_xIsIPv4Broadcast_NoEndPoints( void )
233233
{
234234
BaseType_t xIsBroadcast;
235-
NetworkEndPoint_t *pxEndPoint = NULL;
235+
NetworkEndPoint_t * pxEndPoint = NULL;
236236

237237
FreeRTOS_FirstEndPoint_ExpectAnyArgsAndReturn( NULL );
238238

239-
xIsBroadcast = xIsIPv4Broadcast(0xABCD1235, &pxEndPoint);
239+
xIsBroadcast = xIsIPv4Broadcast( 0xABCD1235, &pxEndPoint );
240240

241241
TEST_ASSERT_EQUAL( pdFALSE, xIsBroadcast );
242242
TEST_ASSERT_EQUAL( NULL, pxEndPoint );
243243
}
244244

245245
/**
246246
* @brief test_xIsIPv4Broadcast_NoEndPointsNoPtr
247-
* To validate if xIsIPv4Broadcast() when no endpoints are there
247+
* To validate if xIsIPv4Broadcast() when no endpoints are there
248248
* and no pointer given.
249249
*/
250250
void test_xIsIPv4Broadcast_NoEndPointsNoPtr( void )
251251
{
252252
BaseType_t xIsBroadcast;
253-
253+
254254
FreeRTOS_FirstEndPoint_ExpectAnyArgsAndReturn( NULL );
255255

256-
xIsBroadcast = xIsIPv4Broadcast(0xABCD1235, NULL);
256+
xIsBroadcast = xIsIPv4Broadcast( 0xABCD1235, NULL );
257257

258258
TEST_ASSERT_EQUAL( pdFALSE, xIsBroadcast );
259259
}

0 commit comments

Comments
 (0)