thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

JANITORIAL: Silence some more GCC 7 fall through warnings

Browse source 
I think these are the last one that were already flagged as being
deliberate.
This commit is contained in:
Torbjörn Andersson 2017-08-06 16:54:38 +02:00
parent a57c5b385d
commit 665f5c99b2
6 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
audio/mods/tfmx.cpp
View file

@ -230,7 +230,7 @@ void Tfmx::macroRun(ChannelContext &channel) {
switch (macroPtr[0]) { switch (macroPtr[0]) {
case 0x00: // Reset + DMA Off. Parameters: deferWait, addset, vol case 0x00: // Reset + DMA Off. Parameters: deferWait, addset, vol
clearEffects(channel); clearEffects(channel);
// FT // fall through
case 0x13: // DMA Off. Parameters: deferWait, addset, vol case 0x13: // DMA Off. Parameters: deferWait, addset, vol
// TODO: implement PArameters // TODO: implement PArameters
Paula::disableChannel(channel.paulaChannel); Paula::disableChannel(channel.paulaChannel);
@ -285,7 +285,7 @@ void Tfmx::macroRun(ChannelContext &channel) {
case 0x10: // Loop Key Up. Parameters: Loopcount, MacroStep(W) case 0x10: // Loop Key Up. Parameters: Loopcount, MacroStep(W)
if (channel.keyUp) if (channel.keyUp)
continue; continue;
// FT // fall through
case 0x05: // Loop. Parameters: Loopcount, MacroStep(W) case 0x05: // Loop. Parameters: Loopcount, MacroStep(W)
if (channel.macroLoopCount != 0) { if (channel.macroLoopCount != 0) {
if (channel.macroLoopCount == 0xFF) if (channel.macroLoopCount == 0xFF)
@ -554,7 +554,7 @@ bool Tfmx::patternRun(PatternContext &pattern) {
case 14: // Stop custompattern case 14: // Stop custompattern
// TODO apparently toggles on/off pattern channel 7 // TODO apparently toggles on/off pattern channel 7
debug(3, "Tfmx: Encountered 'Stop custompattern' command"); debug(3, "Tfmx: Encountered 'Stop custompattern' command");
// FT // fall through
case 4: // Stop this pattern case 4: // Stop this pattern
pattern.command = 0xFF; pattern.command = 0xFF;
--pattern.step; --pattern.step;

4
audio/softsynth/mt32/Synth.cpp
View file

@ -1057,7 +1057,7 @@ void Synth::playSysexWithoutHeader(Bit8u device, Bit8u command, const Bit8u *sys
break; break;
} }
*/ */
// Deliberate fall-through // fall through
case SYSEX_CMD_DT1: case SYSEX_CMD_DT1:
writeSysex(device, sysex, len); writeSysex(device, sysex, len);
break; 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 // FIXME: We should send SYSEX_CMD_RJC in this case
break; break;
} }
// Deliberate fall-through // fall through
case SYSEX_CMD_RQ1: case SYSEX_CMD_RQ1:
readSysex(device, sysex, len); readSysex(device, sysex, len);
break; break;

1
audio/softsynth/opl/dbopl.cpp
View file

@ -413,6 +413,7 @@ Bits Operator::TemplateVolume( ) {
return vol; return vol;
} }
//In sustain phase, but not sustaining, do regular release //In sustain phase, but not sustaining, do regular release
//fall through
case RELEASE: case RELEASE:
vol += RateForward( releaseAdd ); vol += RateForward( releaseAdd );
if ( GCC_UNLIKELY(vol >= ENV_MAX) ) { if ( GCC_UNLIKELY(vol >= ENV_MAX) ) {

2
backends/networking/sdl_net/localwebserver.cpp
View file

@ -245,8 +245,8 @@ void LocalWebserver::handleClient(uint32 i) {
break; break;
// if no handler, answer with default BAD REQUEST // if no handler, answer with default BAD REQUEST
// fallthrough
} }
// fall through
case BAD_REQUEST: case BAD_REQUEST:
setClientGetHandler(_client[i], "<html><head><title>ScummVM - Bad Request</title></head><body>BAD REQUEST</body></html>", 400); setClientGetHandler(_client[i], "<html><head><title>ScummVM - Bad Request</title></head><body>BAD REQUEST</body></html>", 400);

2
engines/sword25/util/lua/ltable.cpp
View file

@ -478,8 +478,8 @@ const TValue *luaH_get (Table *t, const TValue *key) {
lua_number2int(k, n); lua_number2int(k, n);
if (luai_numeq(cast_num(k), nvalue(key))) /* index is int? */ if (luai_numeq(cast_num(k), nvalue(key))) /* index is int? */
return luaH_getnum(t, k); /* use specialized version */ return luaH_getnum(t, k); /* use specialized version */
/* else go through */
} }
/* fall through */
default: { default: {
Node *n = mainposition(t, key); Node *n = mainposition(t, key);
do { /* check whether `key' is somewhere in the chain */ do { /* check whether `key' is somewhere in the chain */

2
gui/editgamedialog.cpp
View file

@ -539,7 +539,7 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
_domain = newDomain; _domain = newDomain;
} }
} }
// FALL THROUGH to default case // fall through
default: default:
OptionsDialog::handleCommand(sender, cmd, data); OptionsDialog::handleCommand(sender, cmd, data);
} }