Skip to content

Commit b08d489

Browse files
tony-josi-awstony-josi-aws
committed
Fix formatting
1 parent c9089ac commit b08d489

File tree

7 files changed

+90
-99
lines changed

7 files changed

+90
-99
lines changed

‎source/FreeRTOS_DHCP.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@
230230
}
231231
else
232232
{
233-
234233
}
235234

236235
break;

‎source/FreeRTOS_DHCPv6.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,8 @@ void vDHCPv6Process( BaseType_t xReset,
442442
}
443443
else
444444
{
445-
446445
}
447-
446+
448447
break;
449448
}
450449

@@ -460,7 +459,6 @@ void vDHCPv6Process( BaseType_t xReset,
460459
}
461460

462461
FreeRTOS_ReleaseUDPPayloadBuffer( pucUDPPayload );
463-
464462
}
465463
}
466464

‎source/FreeRTOS_IP_Utils.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1831,18 +1831,16 @@ uint32_t FreeRTOS_round_down( uint32_t a,
18311831
*/
18321832
void vReleaseSinglePacketFromUDPSocket( const ConstSocket_t xSocket )
18331833
{
1834-
18351834
uint8_t * pucUDPPayload = NULL;
18361835
int32_t lBytes;
18371836

18381837
/* Passing the address of a pointer (pucUDPPayload) because FREERTOS_ZERO_COPY is used. */
18391838
lBytes = FreeRTOS_recvfrom( xSocket, &pucUDPPayload, 0U, FREERTOS_ZERO_COPY, NULL, NULL );
18401839

1841-
if( pucUDPPayload != NULL)
1840+
if( pucUDPPayload != NULL )
18421841
{
18431842
FreeRTOS_ReleaseUDPPayloadBuffer( pucUDPPayload );
18441843
}
1845-
18461844
}
18471845
/*-----------------------------------------------------------*/
18481846

‎test/unit-test/FreeRTOS_DHCP/FreeRTOS_DHCP_utest.c‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ void test_vDHCPProcess_ResetAndIncorrectStateWithSocketAlreadyCreated( void )
344344
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
345345
/* Ignore the buffer argument though. */
346346
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
347-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
347+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
348348
/* Make random number generation pass. */
349349
xApplicationGetRandomNumber_ExpectAndReturn( &( pxEndPoint->xDHCPData.ulTransactionId ), pdTRUE );
350350
/* See if the timer is reloaded. */
@@ -398,9 +398,8 @@ void test_vDHCPProcess_RecvFromReturnsTimeout( void )
398398
xApplicationGetRandomNumber_ExpectAndReturn( &( pxEndPoint->xDHCPData.ulTransactionId ), pdTRUE );
399399
/* See if the timer is reloaded. */
400400
vDHCP_RATimerReload_Expect( &xEndPoint, dhcpINITIAL_TIMER_PERIOD );
401-
402-
vDHCPProcess( pdTRUE, pxEndPoint );
403401

402+
vDHCPProcess( pdTRUE, pxEndPoint );
404403
}
405404

406405
/* Verify the control flow when FreeRTOS_recvfrom with DHCP socket returns IO error/any other error. */
@@ -434,9 +433,8 @@ void test_vDHCPProcess_RecvFromReturnsIOError( void )
434433
xApplicationGetRandomNumber_ExpectAndReturn( &( pxEndPoint->xDHCPData.ulTransactionId ), pdTRUE );
435434
/* See if the timer is reloaded. */
436435
vDHCP_RATimerReload_Expect( &xEndPoint, dhcpINITIAL_TIMER_PERIOD );
437-
438-
vDHCPProcess( pdTRUE, pxEndPoint );
439436

437+
vDHCPProcess( pdTRUE, pxEndPoint );
440438
}
441439

442440
void test_vDHCPProcess_CorrectStateDHCPHookFailsDHCPSocketNULL( void )
@@ -496,7 +494,7 @@ void test_vDHCPProcess_CorrectStateDHCPHookFailsDHCPSocketNonNULL( void )
496494
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
497495
/* Ignore the buffer argument though. */
498496
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
499-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
497+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
500498
/* Make sure that the user indicates anything else than the desired options. */
501499
eStubExpectedDHCPPhase = eDHCPPhasePreDiscover;
502500
pxStubExpectedEndPoint = pxEndPoint;
@@ -544,7 +542,7 @@ void test_vDHCPProcess_CorrectStateDHCPHookDefaultReturn( void )
544542
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
545543
/* Ignore the buffer argument though. */
546544
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
547-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
545+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
548546
/* Make sure that the user indicates anything else than the desired options. */
549547
eStubExpectedDHCPPhase = eDHCPPhasePreDiscover;
550548
pxStubExpectedEndPoint = pxEndPoint;
@@ -589,7 +587,7 @@ void test_vDHCPProcess_CorrectStateDHCPHookContinueReturnDHCPSocketNotNULLButGNW
589587
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
590588
/* Ignore the buffer argument though. */
591589
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
592-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
590+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
593591
/* Make sure that the user indicates anything else than the desired options. */
594592
eStubExpectedDHCPPhase = eDHCPPhasePreDiscover;
595593
pxStubExpectedEndPoint = pxEndPoint;
@@ -628,7 +626,7 @@ void test_vDHCPProcess_CorrectStateDHCPHookContinueReturnDHCPSocketNotNULLButHos
628626
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
629627
/* Ignore the buffer argument though. */
630628
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
631-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
629+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
632630
/* Make sure that the user indicates anything else than the desired options. */
633631
eStubExpectedDHCPPhase = eDHCPPhasePreDiscover;
634632
pxStubExpectedEndPoint = pxEndPoint;
@@ -701,7 +699,7 @@ void test_vDHCPProcess_CorrectStateDHCPHookContinueReturnSendFailsNoBroadcast( v
701699
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
702700
/* Ignore the buffer argument though. */
703701
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
704-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
702+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
705703
/* Make sure that the user indicates anything else than the desired options. */
706704
eStubExpectedDHCPPhase = eDHCPPhasePreDiscover;
707705
pxStubExpectedEndPoint = pxEndPoint;
@@ -750,7 +748,7 @@ void test_vDHCPProcess_CorrectStateDHCPHookContinueReturnSendFailsNoBroadcast_NU
750748
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
751749
/* Ignore the buffer argument though. */
752750
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
753-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
751+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
754752
/* Make sure that the user indicates anything else than the desired options. */
755753
eStubExpectedDHCPPhase = eDHCPPhasePreDiscover;
756754
pxStubExpectedEndPoint = pxEndPoint;
@@ -800,7 +798,7 @@ void test_vDHCPProcess_CorrectStateDHCPHookContinueReturnSendFailsUseBroadCast(
800798
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
801799
/* Ignore the buffer argument though. */
802800
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
803-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
801+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
804802
/* Make sure that the user indicates anything else than the desired options. */
805803
eStubExpectedDHCPPhase = eDHCPPhasePreDiscover;
806804
pxStubExpectedEndPoint = pxEndPoint;
@@ -851,7 +849,7 @@ void test_vDHCPProcess_CorrectStateDHCPHookContinueReturnSendSucceedsUseBroadCas
851849
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
852850
/* Ignore the buffer argument though. */
853851
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
854-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
852+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
855853
/* Make sure that the user indicates anything else than the desired options. */
856854
eStubExpectedDHCPPhase = eDHCPPhasePreDiscover;
857855
pxStubExpectedEndPoint = pxEndPoint;
@@ -903,7 +901,7 @@ void test_vDHCPProcess_CorrectStateDHCPHookContinueReturnSendSucceedsUseBroadCas
903901
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
904902
/* Ignore the buffer argument though. */
905903
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
906-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
904+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
907905
/* Make sure that the user indicates anything else than the desired options. */
908906
eStubExpectedDHCPPhase = eDHCPPhasePreDiscover;
909907
pxStubExpectedEndPoint = pxEndPoint;
@@ -951,7 +949,7 @@ void test_vDHCPProcess_eSendDHCPRequestCorrectStateGNWFails( void )
951949
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
952950
/* Ignore the buffer argument though. */
953951
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
954-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
952+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
955953
/* Get the hostname. */
956954
pcApplicationHostnameHook_ExpectAndReturn( pcHostName );
957955
/* Return NULL network buffer. */
@@ -984,7 +982,7 @@ void test_vDHCPProcess_eSendDHCPRequestCorrectStateGNWSucceedsSendFails( void )
984982
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
985983
/* Ignore the buffer argument though. */
986984
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
987-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
985+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
988986
/* Get the hostname. */
989987
pcApplicationHostnameHook_ExpectAndReturn( pcHostName );
990988
/* Returning a proper network buffer. */
@@ -1023,7 +1021,7 @@ void test_vDHCPProcess_eSendDHCPRequestCorrectStateGNWSucceedsSendSucceeds( void
10231021
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
10241022
/* Ignore the buffer argument though. */
10251023
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
1026-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
1024+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
10271025
/* Get the hostname. */
10281026
pcApplicationHostnameHook_ExpectAndReturn( pcHostName );
10291027
/* Returning a proper network buffer. */
@@ -1066,7 +1064,7 @@ void test_vDHCPProcess_eWaitingOfferRecvfromFailsNoTimeout( void )
10661064
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
10671065
/* Ignore the buffer argument though. */
10681066
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
1069-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
1067+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
10701068

10711069
/* Make sure that there is no timeout. The expression is: xTaskGetTickCount() - pxEndPoint->xDHCPData.xDHCPTxTime ) > pxEndPoint->xDHCPData.xDHCPTxPeriod */
10721070
/* Return a value which makes the difference just equal to the period. */
@@ -1103,7 +1101,7 @@ void test_vDHCPProcess_eWaitingOfferRecvfromFailsTimeoutGiveUp( void ) /* prvClo
11031101
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
11041102
/* Ignore the buffer argument though. */
11051103
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
1106-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
1104+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
11071105

11081106
/* Make sure that there is timeout. The expression is: xTaskGetTickCount() - pxEndPoint->xDHCPData.xDHCPTxTime ) > pxEndPoint->xDHCPData.xDHCPTxPeriod */
11091107
/* Return a value which makes the difference greater than the period. */
@@ -1156,7 +1154,7 @@ void test_vDHCPProcess_eWaitingOfferRecvfromFailsTimeoutDontGiveUpRNGFail( void
11561154
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
11571155
/* Ignore the buffer argument though. */
11581156
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
1159-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
1157+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
11601158

11611159
/* Make sure that there is timeout. The expression is: xTaskGetTickCount() - pxEndPoint->xDHCPData.xDHCPTxTime ) > pxEndPoint->xDHCPData.xDHCPTxPeriod */
11621160
/* Return a value which makes the difference greater than the period. */
@@ -1200,7 +1198,7 @@ void test_vDHCPProcess_eWaitingOfferRecvfromFailsTimeoutDontGiveUpRNGPassUseBroa
12001198
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
12011199
/* Ignore the buffer argument though. */
12021200
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
1203-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
1201+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
12041202

12051203
/* Make sure that there is timeout. The expression is: xTaskGetTickCount() - pxEndPoint->xDHCPData.xDHCPTxTime ) > pxEndPoint->xDHCPData.xDHCPTxPeriod */
12061204
/* Return a value which makes the difference greater than the period. */
@@ -1254,7 +1252,7 @@ void test_vDHCPProcess_eWaitingOfferRecvfromFailsTimeoutDontGiveUpRNGPassNoBroad
12541252
FreeRTOS_recvfrom_ExpectAndReturn( xDHCPv4Socket, NULL, 0UL, FREERTOS_ZERO_COPY + FREERTOS_MSG_PEEK, NULL, NULL, 0 );
12551253
/* Ignore the buffer argument though. */
12561254
FreeRTOS_recvfrom_IgnoreArg_pvBuffer();
1257-
vReleaseSinglePacketFromUDPSocket_Expect(xDHCPv4Socket);
1255+
vReleaseSinglePacketFromUDPSocket_Expect( xDHCPv4Socket );
12581256

12591257
/* Make sure that there is timeout. The expression is: xTaskGetTickCount() - pxEndPoint->xDHCPData.xDHCPTxTime ) > pxEndPoint->xDHCPData.xDHCPTxPeriod */
12601258
/* Return a value which makes the difference greater than the period. */

0 commit comments

Comments
 (0)