From 2ccd397d11e8ec97ad46f99c1373ce88d21350c6 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Sep 2017 09:39:47 -0400
Subject: [PATCH] Build: kill GCC 7's implicit-fallthrough warning
---
src/blua/ldebug.c | 2 +-
src/blua/llex.c | 25 +++++++++++++++----------
src/blua/ltable.c | 1 +
src/d_clisrv.c | 3 +++
src/d_netcmd.c | 2 +-
src/m_menu.c | 5 +++++
src/p_ceilng.c | 5 ++++-
src/p_enemy.c | 2 +-
src/p_floor.c | 2 ++
src/p_inter.c | 4 +++-
src/p_mobj.c | 3 ++-
src/p_spec.c | 10 +++++++++-
src/sdl/i_video.c | 1 +
src/v_video.c | 8 ++++++++
src/y_inter.c | 2 ++
15 files changed, 58 insertions(+), 17 deletions(-)
diff --git a/src/blua/ldebug.c b/src/blua/ldebug.c
index 497d54980e..542e209a18 100644
--- a/src/blua/ldebug.c
+++ b/src/blua/ldebug.c
@@ -412,7 +412,7 @@ static Instruction symbexec (const Proto *pt, int lastpc, int reg) {
case OP_FORLOOP:
case OP_FORPREP:
checkreg(pt, a+3);
- /* go through */
+ /* FALLTHRU */
case OP_JMP: {
int dest = pc+1+b;
/* not full check and jump is forward and do not skip `lastpc'? */
diff --git a/src/blua/llex.c b/src/blua/llex.c
index 0b328dcadd..9e3dc2929b 100644
--- a/src/blua/llex.c
+++ b/src/blua/llex.c
@@ -306,11 +306,12 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
save_and_next(ls); /* skip $ */
seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + 1,
luaZ_bufflen(ls->buff) - 2);
- ls->refstr++; /* expect '\' anytime soon */
+ ls->refstr++; /* expect '\' anytime soon */
lua_assert(ls->lookahead.token == TK_EOS);
- ls->lookahead.token = TK_CONCAT;
- return;
- }
+ ls->lookahead.token = TK_CONCAT;
+ return;
+ }
+ /* FALLTHRU */
default: {
if (!isdigit(ls->current))
save_and_next(ls); /* handles \\, \", \', and \? */
@@ -340,7 +341,8 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
};
switch (i) {
- case 4: save( ls, (c>>8) & 0xff ); // pass-through..
+ case 4: save( ls, (c>>8) & 0xff );
+ /* FALLTHRU */
case 2: save( ls, c&0xff );
break;
case 5:
@@ -350,7 +352,7 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
}
continue;
- // "\u0000".."\x10FFFF": UTF-8 encoded Unicode
+ // "\u0000".."\x10FFFF": UTF-8 encoded Unicode
//
// Note that although codes are entered like this (must have min. four digit,
// just to tease you!) the actual outcome in the string will vary between
@@ -482,20 +484,22 @@ static int llex (LexState *ls, SemInfo *seminfo) {
else if (sep == -1) return '[';
else luaX_lexerror(ls, "invalid long string delimiter", TK_STRING);
}
+ /* FALLTHRU */
case '=': {
next(ls);
if (ls->current != '=') return '=';
else { next(ls); return TK_EQ; }
}
+ /* FALLTHRU */
case '<': {
next(ls);
- if (ls->current == '<') { next(ls); return TK_SHL; }
+ if (ls->current == '<') { next(ls); return TK_SHL; }
if (ls->current != '=') return '<';
else { next(ls); return TK_LE; }
}
case '>': {
next(ls);
- if (ls->current == '>') { next(ls); return TK_SHR; }
+ if (ls->current == '>') { next(ls); return TK_SHR; }
if (ls->current != '=') return '>';
else { next(ls); return TK_GE; }
}
@@ -547,9 +551,10 @@ static int llex (LexState *ls, SemInfo *seminfo) {
}
case '\\': if (ls->refstr) {
ls->refstr--;
- ls->current = '"'; /* whacky! */
- return TK_CONCAT;
+ ls->current = '"'; /* whacky! */
+ return TK_CONCAT;
}
+ /* FALLTHRU */
default: {
if (isspace(ls->current)) {
lua_assert(!currIsNewline(ls));
diff --git a/src/blua/ltable.c b/src/blua/ltable.c
index 9f4d91ff2b..0ddd9ef4ff 100644
--- a/src/blua/ltable.c
+++ b/src/blua/ltable.c
@@ -478,6 +478,7 @@ static TValue *newkey (lua_State *L, Table *t, const TValue *key) {
return luaH_getnum(t, k); /* use specialized version */
/* else go through */
}
+ /* FALLTHRU */
default: {
Node *n = mainposition(t, key);
do { /* check whether `key' is somewhere in the chain */
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 7c21d79fc9..c1f2f8ed4b 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1883,6 +1883,7 @@ static boolean CL_ServerConnectionTicker(boolean viams, const char *tmpsave, tic
break; // exit the case
cl_mode = CL_ASKJOIN; // don't break case continue to cljoin request now
+ /* FALLTHRU */
case CL_ASKJOIN:
CL_LoadServerFiles();
@@ -3605,6 +3606,7 @@ static void HandlePacketFromAwayNode(SINT8 node)
// Do not remove my own server (we have just get a out of order packet)
if (node == servernode)
break;
+ /* FALLTHRU */
default:
DEBFILE(va("unknown packet received (%d) from unknown host\n",netbuffer->packettype));
@@ -3761,6 +3763,7 @@ FILESTAMP
break;
case PT_TEXTCMD2: // splitscreen special
netconsole = nodetoplayer2[node];
+ /* FALLTHRU */
case PT_TEXTCMD:
if (client)
break;
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index b5563f4e89..83bbc7aad5 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -2453,7 +2453,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
error = true;
break;
}
- //fall down
+ /* FALLTHRU */
case GT_TAG:
switch (NetPacket.packet.newteam)
{
diff --git a/src/m_menu.c b/src/m_menu.c
index 45b3d7e578..5b699dcb41 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -3022,6 +3022,7 @@ static void M_DrawGenericMenu(void)
W_CachePatchName(currentMenu->menuitems[i].patch, PU_CACHE));
}
}
+ /* FALLTHRU */
case IT_NOTHING:
case IT_DYBIGSPACE:
y += LINEHEIGHT;
@@ -3073,6 +3074,7 @@ static void M_DrawGenericMenu(void)
break;
case IT_STRING2:
V_DrawString(x, y, 0, currentMenu->menuitems[i].text);
+ /* FALLTHRU */
case IT_DYLITLSPACE:
y += SMALLLINEHEIGHT;
break;
@@ -3085,6 +3087,7 @@ static void M_DrawGenericMenu(void)
case IT_TRANSTEXT:
if (currentMenu->menuitems[i].alphaKey)
y = currentMenu->y+currentMenu->menuitems[i].alphaKey;
+ /* FALLTHRU */
case IT_TRANSTEXT2:
V_DrawString(x, y, V_TRANSLUCENT, currentMenu->menuitems[i].text);
y += SMALLLINEHEIGHT;
@@ -3297,6 +3300,7 @@ static void M_DrawCenteredMenu(void)
W_CachePatchName(currentMenu->menuitems[i].patch, PU_CACHE));
}
}
+ /* FALLTHRU */
case IT_NOTHING:
case IT_DYBIGSPACE:
y += LINEHEIGHT;
@@ -3347,6 +3351,7 @@ static void M_DrawCenteredMenu(void)
break;
case IT_STRING2:
V_DrawCenteredString(x, y, 0, currentMenu->menuitems[i].text);
+ /* FALLTHRU */
case IT_DYLITLSPACE:
y += SMALLLINEHEIGHT;
break;
diff --git a/src/p_ceilng.c b/src/p_ceilng.c
index db30b5cac4..27d7394147 100644
--- a/src/p_ceilng.c
+++ b/src/p_ceilng.c
@@ -79,7 +79,7 @@ void T_MoveCeiling(ceiling_t *ceiling)
P_LinedefExecute((INT16)(ceiling->texture + INT16_MAX + 2), NULL, NULL);
if (ceiling->texture > -1) // flat changing
ceiling->sector->ceilingpic = ceiling->texture;
- // don't break
+ /* FALLTHRU */
case raiseToHighest:
// case raiseCeilingByLine:
case moveCeilingByFrontTexture:
@@ -182,6 +182,7 @@ void T_MoveCeiling(ceiling_t *ceiling)
// except generalized ones, reset speed, start back up
case crushAndRaise:
ceiling->speed = CEILSPEED;
+ /* FALLTHRU */
case fastCrushAndRaise:
ceiling->direction = 1;
break;
@@ -200,6 +201,7 @@ void T_MoveCeiling(ceiling_t *ceiling)
if (ceiling->texture > -1) // flat changing
ceiling->sector->ceilingpic = ceiling->texture;
// don't break
+ /* FALLTHRU */
// in all other cases, just remove the active ceiling
case lowerAndCrush:
@@ -427,6 +429,7 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type)
case crushAndRaise:
ceiling->crush = true;
ceiling->topheight = sec->ceilingheight;
+ /* FALLTHRU */
case lowerAndCrush:
ceiling->bottomheight = sec->floorheight;
ceiling->bottomheight += 4*FRACUNIT;
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 649c788382..9de735edc4 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -6169,7 +6169,7 @@ void A_Boss7Chase(mobj_t *actor)
break;
}
actor->threshold++;
- // fall into...
+ /* FALLTHRU */
case 1: // Chaingun Goop
A_FaceTarget(actor);
P_SetMobjState(actor, S_BLACKEGG_SHOOT1);
diff --git a/src/p_floor.c b/src/p_floor.c
index 9112130145..8438050fa7 100644
--- a/src/p_floor.c
+++ b/src/p_floor.c
@@ -312,6 +312,7 @@ void T_MoveFloor(floormove_t *movefloor)
case moveFloorByFrontSector:
if (movefloor->texture < -1) // chained linedef executing
P_LinedefExecute((INT16)(movefloor->texture + INT16_MAX + 2), NULL, NULL);
+ /* FALLTHRU */
case instantMoveFloorByFrontSector:
if (movefloor->texture > -1) // flat changing
movefloor->sector->floorpic = movefloor->texture;
@@ -360,6 +361,7 @@ void T_MoveFloor(floormove_t *movefloor)
case moveFloorByFrontSector:
if (movefloor->texture < -1) // chained linedef executing
P_LinedefExecute((INT16)(movefloor->texture + INT16_MAX + 2), NULL, NULL);
+ /* FALLTHRU */
case instantMoveFloorByFrontSector:
if (movefloor->texture > -1) // flat changing
movefloor->sector->floorpic = movefloor->texture;
diff --git a/src/p_inter.c b/src/p_inter.c
index 4892d97751..407e091fae 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -383,9 +383,11 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
case MT_REDTEAMRING:
if (player->ctfteam != 1)
return;
+ /* FALLTHRU */
case MT_BLUETEAMRING: // Yes, I'm lazy. Oh well, deal with it.
if (special->type == MT_BLUETEAMRING && player->ctfteam != 2)
return;
+ /* FALLTHRU */
case MT_RING:
case MT_FLINGRING:
if (!(P_CanPickupItem(player, false)))
@@ -3127,7 +3129,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
P_SetMobjState(target, target->info->meleestate); // go to pinch pain state
break;
}
- // fallthrough
+ /* FALLTHRU */
default:
P_SetMobjState(target, target->info->painstate);
break;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 9fdbc37fb8..f520115179 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7138,7 +7138,7 @@ void P_MobjThinker(mobj_t *mobj)
mobj->z = mobj->ceilingz - mobj->height;
else
mobj->z = mobj->floorz;
- // THERE IS NO BREAK HERE ON PURPOSE
+ /* FALLTHRU */
default:
// check mobj against possible water content, before movement code
P_MobjCheckWater(mobj);
@@ -8185,6 +8185,7 @@ void P_PrecipitationEffects(void)
{
case PRECIP_RAIN: // no lightning or thunder whatsoever
sounds_thunder = false;
+ /* FALLTHRU */
case PRECIP_STORM_NOSTRIKES: // no lightning strikes specifically
effects_lightning = false;
break;
diff --git a/src/p_spec.c b/src/p_spec.c
index 48c0f58b3c..ad8d7337b0 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -3625,6 +3625,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
goto DoneSection2;
}
}
+ /* FALLTHRU */
case 4: // Linedef executor that doesn't require touching floor
case 5: // Linedef executor
case 6: // Linedef executor (7 Emeralds)
@@ -4632,6 +4633,8 @@ static void P_RunSpecialSectorCheck(player_t *player, sector_t *sector)
// requires touching floor.
break;
}
+ /* FALLTHRU */
+
case 1: // Starpost activator
case 5: // Fan sector
case 6: // Super Sonic Transform
@@ -5711,6 +5714,8 @@ void P_SpawnSpecials(INT32 fromnetsave)
EV_DoFloor(&lines[i], bounceFloor);
if (lines[i].special == 54)
break;
+ /* FALLTHRU */
+
case 55: // New super cool and awesome moving ceiling type
if (lines[i].backsector)
EV_DoCeiling(&lines[i], bounceCeiling);
@@ -5722,7 +5727,8 @@ void P_SpawnSpecials(INT32 fromnetsave)
EV_DoFloor(&lines[i], bounceFloorCrush);
if (lines[i].special == 57)
- break; //only move the floor
+ break; //only move the floor
+ /* FALLTHRU */
case 58: // New super cool and awesome moving ceiling crush type
if (lines[i].backsector)
@@ -6828,6 +6834,7 @@ static void P_SpawnScrollers(void)
Add_Scroller(sc_ceiling, -dx, dy, control, s, accel, l->flags & ML_NOCLIMB);
if (special != 533)
break;
+ /* FALLTHRU */
case 523: // carry objects on ceiling
dx = FixedMul(dx, CARRYFACTOR);
@@ -6842,6 +6849,7 @@ static void P_SpawnScrollers(void)
Add_Scroller(sc_floor, -dx, dy, control, s, accel, l->flags & ML_NOCLIMB);
if (special != 530)
break;
+ /* FALLTHRU */
case 520: // carry objects on floor
dx = FixedMul(dx, CARRYFACTOR);
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 9cebe49459..707c66dd67 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -941,6 +941,7 @@ static inline boolean I_SkipFrame(void)
case GS_LEVEL:
if (!paused)
return false;
+ /* FALLTHRU */
case GS_TIMEATTACK:
case GS_WAITINGPLAYERS:
return skip; // Skip odd frames
diff --git a/src/v_video.c b/src/v_video.c
index 64bb3214e0..cc81cedbc0 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -1083,6 +1083,7 @@ char *V_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
{
case V_MONOSPACE:
spacewidth = 8;
+ /* FALLTHRU */
case V_OLDSPACING:
charwidth = 8;
break;
@@ -1160,6 +1161,7 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
{
case V_MONOSPACE:
spacewidth = 8;
+ /* FALLTHRU */
case V_OLDSPACING:
charwidth = 8;
break;
@@ -1269,6 +1271,7 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
{
case V_MONOSPACE:
spacewidth = 4;
+ /* FALLTHRU */
case V_OLDSPACING:
charwidth = 4;
break;
@@ -1370,6 +1373,7 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
{
case V_MONOSPACE:
spacewidth = 5;
+ /* FALLTHRU */
case V_OLDSPACING:
charwidth = 5;
break;
@@ -1463,6 +1467,7 @@ void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
{
case V_MONOSPACE:
spacewidth = 8;
+ /* FALLTHRU */
case V_OLDSPACING:
charwidth = 8;
break;
@@ -1747,6 +1752,7 @@ INT32 V_StringWidth(const char *string, INT32 option)
{
case V_MONOSPACE:
spacewidth = 8;
+ /* FALLTHRU */
case V_OLDSPACING:
charwidth = 8;
break;
@@ -1785,6 +1791,7 @@ INT32 V_SmallStringWidth(const char *string, INT32 option)
{
case V_MONOSPACE:
spacewidth = 4;
+ /* FALLTHRU */
case V_OLDSPACING:
charwidth = 4;
break;
@@ -1823,6 +1830,7 @@ INT32 V_ThinStringWidth(const char *string, INT32 option)
{
case V_MONOSPACE:
spacewidth = 5;
+ /* FALLTHRU */
case V_OLDSPACING:
charwidth = 5;
break;
diff --git a/src/y_inter.c b/src/y_inter.c
index 42f1e22358..cfdc2a0800 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -1004,6 +1004,7 @@ void Y_StartIntermission(void)
// fall back into the coop intermission for now
intertype = int_coop;
+ /* FALLTHRU */
case int_coop: // coop or single player, normal level
{
// award time and ring bonuses
@@ -1117,6 +1118,7 @@ void Y_StartIntermission(void)
// fall back into the special stage intermission for now
intertype = int_spec;
+ /* FALLTHRU */
case int_spec: // coop or single player, special stage
{
// Update visitation flags?
--
GitLab