Skip to content

Commit dd377d6

Browse files
JacobBarthelmehJacobBarthelmeh
authored
Merge pull request #815 from ejohnstown/fallthrough
Change switch fallthrough
2 parents 1828eea + b7289f1 commit dd377d6

File tree

5 files changed

+108
-119
lines changed

5 files changed

+108
-119
lines changed

‎src/internal.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8286,7 +8286,7 @@ static int DoChannelOpen(WOLFSSH* ssh,
82868286
#ifdef WOLFSSH_FWD
82878287
case ID_CHANTYPE_TCPIP_DIRECT:
82888288
isDirect = 1;
8289-
NO_BREAK;
8289+
FALL_THROUGH;
82908290
case ID_CHANTYPE_TCPIP_FORWARD:
82918291
ret = DoChannelOpenForward(ssh,
82928292
&host, &hostPort, &origin, &originPort,
@@ -9973,7 +9973,7 @@ int DoReceive(WOLFSSH* ssh)
99739973
break;
99749974
}
99759975
}
9976-
NO_BREAK;
9976+
FALL_THROUGH;
99779977

99789978
case PROCESS_PACKET_LENGTH:
99799979
if (ssh->inputBuffer.idx + UINT32_SZ > ssh->inputBuffer.bufferSz) {
@@ -9990,7 +9990,7 @@ int DoReceive(WOLFSSH* ssh)
99909990
return WS_FATAL_ERROR;
99919991
}
99929992
ssh->processReplyState = PROCESS_PACKET_FINISH;
9993-
NO_BREAK;
9993+
FALL_THROUGH;
99949994

99959995
case PROCESS_PACKET_FINISH:
99969996
/* readSz is the full packet size */
@@ -10064,7 +10064,7 @@ int DoReceive(WOLFSSH* ssh)
1006410064
ret = WS_FATAL_ERROR;
1006510065
break;
1006610066
}
10067-
NO_BREAK;
10067+
FALL_THROUGH;
1006810068

1006910069
case PROCESS_PACKET:
1007010070
ret = DoPacket(ssh, &bufferConsumed);
@@ -10818,7 +10818,7 @@ static int SendKexGetSigningKey(WOLFSSH* ssh,
1081810818
#ifdef WOLFSSH_CERTS
1081910819
case ID_X509V3_SSH_RSA:
1082010820
isCert = 1;
10821-
NO_BREAK;
10821+
FALL_THROUGH;
1082210822
#endif
1082310823
case ID_SSH_RSA:
1082410824
case ID_RSA_SHA2_256:
@@ -10922,7 +10922,7 @@ static int SendKexGetSigningKey(WOLFSSH* ssh,
1092210922
case ID_X509V3_ECDSA_SHA2_NISTP384:
1092310923
case ID_X509V3_ECDSA_SHA2_NISTP521:
1092410924
isCert = 1;
10925-
NO_BREAK;
10925+
FALL_THROUGH;
1092610926
#endif
1092710927
case ID_ECDSA_SHA2_NISTP256:
1092810928
case ID_ECDSA_SHA2_NISTP384:

‎src/ssh.c‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
515515
}
516516
ssh->acceptState = ACCEPT_SERVER_VERSION_SENT;
517517
WLOG(WS_LOG_DEBUG, acceptState, "SERVER_VERSION_SENT");
518-
NO_BREAK;
518+
FALL_THROUGH;
519519

520520
case ACCEPT_SERVER_VERSION_SENT:
521521
while (ssh->clientState < CLIENT_VERSION_DONE) {
@@ -527,7 +527,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
527527
}
528528
ssh->acceptState = ACCEPT_CLIENT_VERSION_DONE;
529529
WLOG(WS_LOG_DEBUG, acceptState, "CLIENT_VERSION_DONE");
530-
NO_BREAK;
530+
FALL_THROUGH;
531531

532532
case ACCEPT_CLIENT_VERSION_DONE:
533533
if ( (ssh->error = SendKexInit(ssh)) < WS_SUCCESS) {
@@ -537,7 +537,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
537537
}
538538
ssh->acceptState = ACCEPT_SERVER_KEXINIT_SENT;
539539
WLOG(WS_LOG_DEBUG, acceptState, "SERVER_KEXINIT_SENT");
540-
NO_BREAK;
540+
FALL_THROUGH;
541541

542542
case ACCEPT_SERVER_KEXINIT_SENT:
543543
while (ssh->isKeying) {
@@ -549,7 +549,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
549549
}
550550
ssh->acceptState = ACCEPT_KEYED;
551551
WLOG(WS_LOG_DEBUG, acceptState, "KEYED");
552-
NO_BREAK;
552+
FALL_THROUGH;
553553

554554
case ACCEPT_KEYED:
555555
while (ssh->clientState < CLIENT_USERAUTH_REQUEST_DONE) {
@@ -561,7 +561,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
561561
}
562562
ssh->acceptState = ACCEPT_CLIENT_USERAUTH_REQUEST_DONE;
563563
WLOG(WS_LOG_DEBUG, acceptState, "CLIENT_USERAUTH_REQUEST_DONE");
564-
NO_BREAK;
564+
FALL_THROUGH;
565565

566566
case ACCEPT_CLIENT_USERAUTH_REQUEST_DONE:
567567
if ( (ssh->error = SendServiceAccept(ssh,
@@ -573,7 +573,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
573573
ssh->acceptState = ACCEPT_SERVER_USERAUTH_ACCEPT_SENT;
574574
WLOG(WS_LOG_DEBUG, acceptState,
575575
"ACCEPT_SERVER_USERAUTH_ACCEPT_SENT");
576-
NO_BREAK;
576+
FALL_THROUGH;
577577

578578
case ACCEPT_SERVER_USERAUTH_ACCEPT_SENT:
579579
while (ssh->clientState < CLIENT_USERAUTH_DONE) {
@@ -585,7 +585,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
585585
}
586586
ssh->acceptState = ACCEPT_CLIENT_USERAUTH_DONE;
587587
WLOG(WS_LOG_DEBUG, acceptState, "CLIENT_USERAUTH_DONE");
588-
NO_BREAK;
588+
FALL_THROUGH;
589589

590590
case ACCEPT_CLIENT_USERAUTH_DONE:
591591
if ( (ssh->error = SendUserAuthSuccess(ssh)) < WS_SUCCESS) {
@@ -595,7 +595,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
595595
}
596596
ssh->acceptState = ACCEPT_SERVER_USERAUTH_SENT;
597597
WLOG(WS_LOG_DEBUG, acceptState, "SERVER_USERAUTH_SENT");
598-
NO_BREAK;
598+
FALL_THROUGH;
599599

600600
case ACCEPT_SERVER_USERAUTH_SENT:
601601
while (ssh->clientState < CLIENT_CHANNEL_OPEN_DONE) {
@@ -607,7 +607,7 @@ int wolfSSH_accept(WOLFSSH* ssh)
607607
}
608608
ssh->acceptState = ACCEPT_SERVER_CHANNEL_ACCEPT_SENT;
609609
WLOG(WS_LOG_DEBUG, acceptState, "SERVER_CHANNEL_ACCEPT_SENT");
610-
NO_BREAK;
610+
FALL_THROUGH;
611611

612612
case ACCEPT_SERVER_CHANNEL_ACCEPT_SENT:
613613
while (ssh->clientState < CLIENT_DONE) {
@@ -770,7 +770,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
770770
}
771771
ssh->connectState = CONNECT_CLIENT_VERSION_SENT;
772772
WLOG(WS_LOG_DEBUG, connectState, "CLIENT_VERSION_SENT");
773-
NO_BREAK;
773+
FALL_THROUGH;
774774

775775
case CONNECT_CLIENT_VERSION_SENT:
776776
while (ssh->serverState < SERVER_VERSION_DONE) {
@@ -782,7 +782,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
782782
}
783783
ssh->connectState = CONNECT_SERVER_VERSION_DONE;
784784
WLOG(WS_LOG_DEBUG, connectState, "SERVER_VERSION_DONE");
785-
NO_BREAK;
785+
FALL_THROUGH;
786786

787787
case CONNECT_SERVER_VERSION_DONE:
788788
if ( (ssh->error = SendKexInit(ssh)) < WS_SUCCESS) {
@@ -792,7 +792,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
792792
}
793793
ssh->connectState = CONNECT_CLIENT_KEXINIT_SENT;
794794
WLOG(WS_LOG_DEBUG, connectState, "CLIENT_KEXINIT_SENT");
795-
NO_BREAK;
795+
FALL_THROUGH;
796796

797797
case CONNECT_CLIENT_KEXINIT_SENT:
798798
while (ssh->serverState < SERVER_KEXINIT_DONE) {
@@ -804,7 +804,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
804804
}
805805
ssh->connectState = CONNECT_SERVER_KEXINIT_DONE;
806806
WLOG(WS_LOG_DEBUG, connectState, "SERVER_KEXINIT_DONE");
807-
NO_BREAK;
807+
FALL_THROUGH;
808808

809809
case CONNECT_SERVER_KEXINIT_DONE:
810810
if (ssh->handshake == NULL) {
@@ -825,7 +825,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
825825
}
826826
ssh->connectState = CONNECT_CLIENT_KEXDH_INIT_SENT;
827827
WLOG(WS_LOG_DEBUG, connectState, "CLIENT_KEXDH_INIT_SENT");
828-
NO_BREAK;
828+
FALL_THROUGH;
829829

830830
case CONNECT_CLIENT_KEXDH_INIT_SENT:
831831
while (ssh->isKeying) {
@@ -837,7 +837,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
837837
}
838838
ssh->connectState = CONNECT_KEYED;
839839
WLOG(WS_LOG_DEBUG, connectState, "KEYED");
840-
NO_BREAK;
840+
FALL_THROUGH;
841841

842842
case CONNECT_KEYED:
843843
if ( (ssh->error = SendServiceRequest(ssh, ID_SERVICE_USERAUTH)) <
@@ -847,7 +847,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
847847
}
848848
ssh->connectState = CONNECT_CLIENT_USERAUTH_REQUEST_SENT;
849849
WLOG(WS_LOG_DEBUG, connectState, "CLIENT_USERAUTH_REQUEST_SENT");
850-
NO_BREAK;
850+
FALL_THROUGH;
851851

852852
case CONNECT_CLIENT_USERAUTH_REQUEST_SENT:
853853
while (ssh->serverState < SERVER_USERAUTH_REQUEST_DONE) {
@@ -859,7 +859,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
859859
}
860860
ssh->connectState = CONNECT_SERVER_USERAUTH_REQUEST_DONE;
861861
WLOG(WS_LOG_DEBUG, connectState, "SERVER_USERAUTH_REQUEST_DONE");
862-
NO_BREAK;
862+
FALL_THROUGH;
863863

864864
case CONNECT_SERVER_USERAUTH_REQUEST_DONE:
865865
#ifdef WOLFSSH_AGENT
@@ -880,7 +880,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
880880
}
881881
ssh->connectState = CONNECT_CLIENT_USERAUTH_SENT;
882882
WLOG(WS_LOG_DEBUG, connectState, "CLIENT_USERAUTH_SENT");
883-
NO_BREAK;
883+
FALL_THROUGH;
884884

885885
case CONNECT_CLIENT_USERAUTH_SENT:
886886
while (ssh->serverState < SERVER_USERAUTH_ACCEPT_DONE) {
@@ -892,7 +892,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
892892
}
893893
ssh->connectState = CONNECT_SERVER_USERAUTH_ACCEPT_DONE;
894894
WLOG(WS_LOG_DEBUG, connectState, "SERVER_USERAUTH_ACCEPT_DONE");
895-
NO_BREAK;
895+
FALL_THROUGH;
896896

897897
case CONNECT_SERVER_USERAUTH_ACCEPT_DONE:
898898
{
@@ -924,7 +924,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
924924
ssh->connectState = CONNECT_CLIENT_CHANNEL_OPEN_SESSION_SENT;
925925
WLOG(WS_LOG_DEBUG, connectState,
926926
"CLIENT_CHANNEL_OPEN_SESSION_SENT");
927-
NO_BREAK;
927+
FALL_THROUGH;
928928

929929
case CONNECT_CLIENT_CHANNEL_OPEN_SESSION_SENT:
930930
while (ssh->serverState < SERVER_CHANNEL_OPEN_DONE) {
@@ -937,7 +937,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
937937
ssh->connectState = CONNECT_SERVER_CHANNEL_OPEN_SESSION_DONE;
938938
WLOG(WS_LOG_DEBUG, connectState,
939939
"SERVER_CHANNEL_OPEN_SESSION_DONE");
940-
NO_BREAK;
940+
FALL_THROUGH;
941941

942942
case CONNECT_SERVER_CHANNEL_OPEN_SESSION_DONE:
943943
#ifdef WOLFSSH_AGENT
@@ -953,7 +953,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
953953
WLOG(WS_LOG_DEBUG, connectState,
954954
"CLIENT_CHANNEL_AGENT_REQUEST_SENT");
955955
ssh->connectState = CONNECT_CLIENT_CHANNEL_AGENT_REQUEST_SENT;
956-
NO_BREAK;
956+
FALL_THROUGH;
957957

958958
case CONNECT_CLIENT_CHANNEL_AGENT_REQUEST_SENT:
959959
#if defined(WOLFSSH_TERM) && !defined(NO_FILESYSTEM)
@@ -969,7 +969,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
969969
WLOG(WS_LOG_DEBUG, connectState,
970970
"CLIENT_CHANNEL_TERMINAL_REQUEST_SENT");
971971
ssh->connectState = CONNECT_CLIENT_CHANNEL_TERMINAL_REQUEST_SENT;
972-
NO_BREAK;
972+
FALL_THROUGH;
973973

974974
case CONNECT_CLIENT_CHANNEL_TERMINAL_REQUEST_SENT:
975975
if ( (ssh->error = SendChannelRequest(ssh, ssh->channelName,
@@ -981,7 +981,7 @@ int wolfSSH_connect(WOLFSSH* ssh)
981981
ssh->connectState = CONNECT_CLIENT_CHANNEL_REQUEST_SENT;
982982
WLOG(WS_LOG_DEBUG, connectState,
983983
"CLIENT_CHANNEL_REQUEST_SENT");
984-
NO_BREAK;
984+
FALL_THROUGH;
985985

986986
case CONNECT_CLIENT_CHANNEL_REQUEST_SENT:
987987
while (ssh->serverState < SERVER_DONE) {
@@ -1530,7 +1530,7 @@ int wolfSSH_SetChannelType(WOLFSSH* ssh, byte type, byte* name, word32 nameSz)
15301530
WLOG(WS_LOG_DEBUG, "Server side exec unsupported");
15311531
return WS_BAD_ARGUMENT;
15321532
}
1533-
NO_BREAK;
1533+
FALL_THROUGH;
15341534

15351535
case WOLFSSH_SESSION_SUBSYSTEM:
15361536
ssh->connectChannelId = type;

‎src/wolfscp.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,7 +1408,7 @@ int ReceiveScpMessage(WOLFSSH* ssh)
14081408

14091409
switch (buf[0]) {
14101410
case 'C':
1411-
NO_BREAK;
1411+
FALL_THROUGH;
14121412

14131413
case 'D':
14141414
if (buf[0] == 'C') {
@@ -1512,7 +1512,7 @@ int SendScpConfirmation(WOLFSSH* ssh)
15121512

15131513
case WS_SCP_CONTINUE:
15141514
/* default to ok confirmation */
1515-
NO_BREAK;
1515+
FALL_THROUGH;
15161516

15171517
default:
15181518
msg[0] = SCP_CONFIRM_OK;
@@ -1566,9 +1566,9 @@ int ReceiveScpConfirmation(WOLFSSH* ssh)
15661566
case SCP_CONFIRM_OK:
15671567
break;
15681568
case SCP_CONFIRM_ERR:
1569-
NO_BREAK;
1569+
FALL_THROUGH;
15701570
case SCP_CONFIRM_FATAL:
1571-
NO_BREAK;
1571+
FALL_THROUGH;
15721572
default:
15731573
WLOG(WS_LOG_ERROR,
15741574
"scp error: peer sent error confirmation (code: %d)",

0 commit comments

Comments
 (0)