BUILD: Re-enable -Wimplicit-fallthrough
Getting rid of this warning is cleaner solved using a 'fall through' comment,
because it clarifies intent to a human reader.
This patch adjust a few places that cause -Wimplicit-fallthrough to trigger:
- Fix typos in the comment.
- Remove redundant 'no break' that trips up gcc from comment.
- Move the comment out of the block when the 'case' is completely surrounded
by braces.
- Add comments where I could determine that the fall through was intentional.
Changes tested on
gcc (Debian 9.3.0-13) 9.3.0
Copyright (C) 2019 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
using
make -j4 all TARGET=linux-glibc USE_OPENSSL=1 USE_LUA=1 USE_ZLIB=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_GETADDRINFO=1
diff --git a/Makefile b/Makefile
index c4a8529..9d8d350 100644
--- a/Makefile
+++ b/Makefile
@@ -185,7 +185,6 @@
SPEC_CFLAGS += $(call cc-nowarn,unused-parameter)
SPEC_CFLAGS += $(call cc-nowarn,clobbered)
SPEC_CFLAGS += $(call cc-nowarn,missing-field-initializers)
-SPEC_CFLAGS += $(call cc-nowarn,implicit-fallthrough)
SPEC_CFLAGS += $(call cc-nowarn,stringop-overflow)
SPEC_CFLAGS += $(call cc-nowarn,cast-function-type)
SPEC_CFLAGS += $(call cc-nowarn,string-plus-int)
diff --git a/src/acl.c b/src/acl.c
index c328844..5fea5dc 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -607,6 +607,7 @@
case STD_OP_GT:
value++; /* gt = ge + 1 */
+ /* fall through */
case STD_OP_GE:
if (expr->pat.parse == pat_parse_int)
@@ -619,6 +620,7 @@
case STD_OP_LT:
value--; /* lt = le - 1 */
+ /* fall through */
case STD_OP_LE:
if (expr->pat.parse == pat_parse_int)
diff --git a/src/check.c b/src/check.c
index 18f83fa..82f18e3 100644
--- a/src/check.c
+++ b/src/check.c
@@ -445,7 +445,7 @@
if (s->check.health > s->check.rise)
s->check.health = s->check.rise + 1;
- /* no break - fall through */
+ /* fall through */
case HANA_ONERR_FAILCHK:
/* simulate a failed health check */
diff --git a/src/cli.c b/src/cli.c
index f850dd7..a8d3934 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1191,6 +1191,7 @@
return 0;
}
appctx->st2 = STAT_ST_LIST;
+ /* fall through */
case STAT_ST_LIST:
if (global.stats_fe) {
@@ -1267,6 +1268,7 @@
appctx->ctx.cli.p0 = &bind_conf->by_fe; /* store the latest list node dumped */
}
}
+ /* fall through */
default:
appctx->st2 = STAT_ST_FIN;
return 1;
diff --git a/src/hlua.c b/src/hlua.c
index 6a75e88..18c8307 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -6255,6 +6255,7 @@
case HLUA_E_ERR:
/* Display log. */
SEND_ERR(stream->be, "Lua converter '%s' returns an unknown error.\n", fcn->name);
+ /* fall through */
default:
return 0;
@@ -6388,6 +6389,7 @@
case HLUA_E_ERR:
/* Display log. */
SEND_ERR(smp->px, "Lua sample-fetch '%s' returns an unknown error.\n", fcn->name);
+ /* fall through */
default:
return 0;
diff --git a/src/peers.c b/src/peers.c
index 478cbd2..f16ba8e 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -2281,8 +2281,8 @@
appctx->ctx.peers.ptr = curpeer;
appctx->st0 = PEER_SESS_ST_SENDSUCCESS;
_HA_ATOMIC_ADD(&active_peers, 1);
- /* fall through */
}
+ /* fall through */
case PEER_SESS_ST_SENDSUCCESS: {
prev_state = appctx->st0;
if (!curpeer) {
@@ -2328,8 +2328,8 @@
/* switch to the waiting statuscode state */
appctx->st0 = PEER_SESS_ST_GETSTATUS;
- /* fall through */
}
+ /* fall through */
case PEER_SESS_ST_GETSTATUS: {
prev_state = appctx->st0;
if (!curpeer) {
@@ -2370,8 +2370,8 @@
}
_HA_ATOMIC_ADD(&connected_peers, 1);
appctx->st0 = PEER_SESS_ST_WAITMSG;
- /* fall through */
}
+ /* fall through */
case PEER_SESS_ST_WAITMSG: {
uint32_t msg_len = 0;
char *msg_cur = trash.area;
@@ -2456,8 +2456,8 @@
goto out;
appctx->st0 = PEER_SESS_ST_END;
prev_state = appctx->st0;
- /* fall through */
}
+ /* fall through */
case PEER_SESS_ST_END: {
if (prev_state == PEER_SESS_ST_WAITMSG)
_HA_ATOMIC_SUB(&connected_peers, 1);
diff --git a/src/stream_interface.c b/src/stream_interface.c
index ef2fc0b..59cce13 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -232,6 +232,7 @@
case SI_ST_TAR:
/* Note that none of these states may happen with applets */
si->state = SI_ST_DIS;
+ /* fall through */
default:
si->flags &= ~SI_FL_NOLINGER;
si_rx_shut_blk(si);
@@ -1667,6 +1668,7 @@
/* Note that none of these states may happen with applets */
si_applet_release(si);
si->state = SI_ST_DIS;
+ /* fall through */
default:
si->flags &= ~SI_FL_NOLINGER;
si_rx_shut_blk(si);
diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index 2b7c0c5..893c225 100644
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -3565,7 +3565,7 @@
case TCPCHK_ACT_CONNECT:
if (!chk->comment && comment)
chk->comment = strdup(comment);
- /* fall though */
+ /* fall through */
case TCPCHK_ACT_ACTION_KW:
free(comment);
comment = NULL;