From 665f5c99b2ca3db67f75ecfa683389e213d942a6 Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Sun, 6 Aug 2017 16:54:38 +0200 Subject: JANITORIAL: Silence some more GCC 7 fall through warnings I think these are the last one that were already flagged as being deliberate. --- audio/mods/tfmx.cpp | 6 +++--- audio/softsynth/mt32/Synth.cpp | 4 ++-- audio/softsynth/opl/dbopl.cpp | 1 + backends/networking/sdl_net/localwebserver.cpp | 2 +- engines/sword25/util/lua/ltable.cpp | 2 +- gui/editgamedialog.cpp | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/audio/mods/tfmx.cpp b/audio/mods/tfmx.cpp index db3dad88ef..8d31faa104 100644 --- a/audio/mods/tfmx.cpp +++ b/audio/mods/tfmx.cpp @@ -230,7 +230,7 @@ void Tfmx::macroRun(ChannelContext &channel) { switch (macroPtr[0]) { case 0x00: // Reset + DMA Off. Parameters: deferWait, addset, vol clearEffects(channel); - // FT + // fall through case 0x13: // DMA Off. Parameters: deferWait, addset, vol // TODO: implement PArameters Paula::disableChannel(channel.paulaChannel); @@ -285,7 +285,7 @@ void Tfmx::macroRun(ChannelContext &channel) { case 0x10: // Loop Key Up. Parameters: Loopcount, MacroStep(W) if (channel.keyUp) continue; - // FT + // fall through case 0x05: // Loop. Parameters: Loopcount, MacroStep(W) if (channel.macroLoopCount != 0) { if (channel.macroLoopCount == 0xFF) @@ -554,7 +554,7 @@ bool Tfmx::patternRun(PatternContext &pattern) { case 14: // Stop custompattern // TODO apparently toggles on/off pattern channel 7 debug(3, "Tfmx: Encountered 'Stop custompattern' command"); - // FT + // fall through case 4: // Stop this pattern pattern.command = 0xFF; --pattern.step; diff --git a/audio/softsynth/mt32/Synth.cpp b/audio/softsynth/mt32/Synth.cpp index 00832c5d50..3a478b5b62 100755 --- a/audio/softsynth/mt32/Synth.cpp +++ b/audio/softsynth/mt32/Synth.cpp @@ -1057,7 +1057,7 @@ void Synth::playSysexWithoutHeader(Bit8u device, Bit8u command, const Bit8u *sys break; } */ - // Deliberate fall-through + // fall through case SYSEX_CMD_DT1: writeSysex(device, sysex, len); break; @@ -1067,7 +1067,7 @@ void Synth::playSysexWithoutHeader(Bit8u device, Bit8u command, const Bit8u *sys // FIXME: We should send SYSEX_CMD_RJC in this case break; } - // Deliberate fall-through + // fall through case SYSEX_CMD_RQ1: readSysex(device, sysex, len); break; diff --git a/audio/softsynth/opl/dbopl.cpp b/audio/softsynth/opl/dbopl.cpp index 43eb40e7ba..19be94cf69 100644 --- a/audio/softsynth/opl/dbopl.cpp +++ b/audio/softsynth/opl/dbopl.cpp @@ -413,6 +413,7 @@ Bits Operator::TemplateVolume( ) { return vol; } //In sustain phase, but not sustaining, do regular release + //fall through case RELEASE: vol += RateForward( releaseAdd ); if ( GCC_UNLIKELY(vol >= ENV_MAX) ) { diff --git a/backends/networking/sdl_net/localwebserver.cpp b/backends/networking/sdl_net/localwebserver.cpp index 5ddeb5e200..81362ea482 100644 --- a/backends/networking/sdl_net/localwebserver.cpp +++ b/backends/networking/sdl_net/localwebserver.cpp @@ -245,8 +245,8 @@ void LocalWebserver::handleClient(uint32 i) { break; // if no handler, answer with default BAD REQUEST - // fallthrough } + // fall through case BAD_REQUEST: setClientGetHandler(_client[i], "ScummVM - Bad RequestBAD REQUEST", 400); diff --git a/engines/sword25/util/lua/ltable.cpp b/engines/sword25/util/lua/ltable.cpp index 45381fe673..76de991f25 100644 --- a/engines/sword25/util/lua/ltable.cpp +++ b/engines/sword25/util/lua/ltable.cpp @@ -478,8 +478,8 @@ const TValue *luaH_get (Table *t, const TValue *key) { lua_number2int(k, n); if (luai_numeq(cast_num(k), nvalue(key))) /* index is int? */ return luaH_getnum(t, k); /* use specialized version */ - /* else go through */ } + /* fall through */ default: { Node *n = mainposition(t, key); do { /* check whether `key' is somewhere in the chain */ diff --git a/gui/editgamedialog.cpp b/gui/editgamedialog.cpp index 85b37929dc..94c74b40c0 100644 --- a/gui/editgamedialog.cpp +++ b/gui/editgamedialog.cpp @@ -539,7 +539,7 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat _domain = newDomain; } } - // FALL THROUGH to default case + // fall through default: OptionsDialog::handleCommand(sender, cmd, data); } -- cgit v1.2.3