[Scummvm-git-logs] scummvm master -> 665f5c99b2ca3db67f75ecfa683389e213d942a6

eriktorbjorn eriktorbjorn at telia.com
Sun Aug 6 16:56:54 CEST 2017


This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0bde79b2b8 JANITORIAL: Silence some more GCC 7 fall through warnings
a70767503e SWORD1: Silence GCC warning about potential overflow
3d8d5541dc JANITORIAL: Silence GCC 7 fall through warning
a57c5b385d SWORD25: Increase buffer length to silence GCC 7 warning
665f5c99b2 JANITORIAL: Silence some more GCC 7 fall through warnings


Commit: 0bde79b2b84ea95bb1f4b79600bcd9a14b03079c
    https://github.com/scummvm/scummvm/commit/0bde79b2b84ea95bb1f4b79600bcd9a14b03079c
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2017-08-06T16:35:25+02:00

Commit Message:
JANITORIAL: Silence some more GCC 7 fall through warnings

Changed paths:
    engines/scumm/insane/insane_ben.cpp
    engines/scumm/insane/insane_scenes.cpp


diff --git a/engines/scumm/insane/insane_ben.cpp b/engines/scumm/insane/insane_ben.cpp
index de90461..b96ba56 100644
--- a/engines/scumm/insane/insane_ben.cpp
+++ b/engines/scumm/insane/insane_ben.cpp
@@ -868,7 +868,7 @@ void Insane::actor02Reaction(int32 buttons) {
 					_actor[0].act[2].state = 77;
 					break;
 				}
-				// break skipped intentionally
+				// fall through
 			default:
 				smlayer_setActorFacing(0, 2, 20, 180);
 				_actor[0].act[2].state = 20;
@@ -954,7 +954,7 @@ void Insane::actor02Reaction(int32 buttons) {
 					_actor[0].act[2].state = 83;
 					break;
 				}
-				// break missed intentionally
+				// fall through
 			default:
 				smlayer_setActorFacing(0, 2, 20, 180);
 				_actor[0].act[2].state = 24;
@@ -1035,7 +1035,7 @@ void Insane::actor02Reaction(int32 buttons) {
 					_actor[0].act[2].state = 75;
 					break;
 				}
-				// break missed intentionaly
+				// fall through
 			default:
 				smlayer_setActorFacing(0, 2, 20, 180);
 				_actor[0].act[2].state = 28;
diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp
index 51b4bb3..c5897be 100644
--- a/engines/scumm/insane/insane_scenes.cpp
+++ b/engines/scumm/insane/insane_scenes.cpp
@@ -222,7 +222,7 @@ void Insane::stopSceneSounds(int sceneId) {
 	case 3:
 	case 21:
 		flag = 1;
-		// break is omittted intentionally
+		// fall through
 	case 13:
 		if (_actor[0].runningSound != 0)
 			smlayer_stopSound(_actor[0].runningSound);


Commit: a70767503e6a27d4f42a97033971ca4d760df32c
    https://github.com/scummvm/scummvm/commit/a70767503e6a27d4f42a97033971ca4d760df32c
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2017-08-06T16:38:03+02:00

Commit Message:
SWORD1: Silence GCC warning about potential overflow

Probably doesn't ever happen, but now 'fileName' is as large as it
needs to be if 'label' is as long as it can be.

Changed paths:
    engines/sword1/resman.cpp


diff --git a/engines/sword1/resman.cpp b/engines/sword1/resman.cpp
index 2f8b37d..f3b0f83 100644
--- a/engines/sword1/resman.cpp
+++ b/engines/sword1/resman.cpp
@@ -309,7 +309,7 @@ Common::File *ResMan::resFile(uint32 id) {
 			_openCluEnd = cluster;
 		}
 		cluster->file = new Common::File();
-		char fileName[15];
+		char fileName[36];
 		// Supposes that big endian means mac cluster file and little endian means PC cluster file.
 		// This works, but we may want to separate the file name from the endianess or try .CLM extension if opening.clu file fail.
 		if (_isBigEndian)


Commit: 3d8d5541dc1ccdeae78b86f869f83b3d5b798e15
    https://github.com/scummvm/scummvm/commit/3d8d5541dc1ccdeae78b86f869f83b3d5b798e15
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2017-08-06T16:40:42+02:00

Commit Message:
JANITORIAL: Silence GCC 7 fall through warning

Changed paths:
    engines/sword25/util/lua/ldebug.cpp


diff --git a/engines/sword25/util/lua/ldebug.cpp b/engines/sword25/util/lua/ldebug.cpp
index 396c5df..96607d8 100644
--- a/engines/sword25/util/lua/ldebug.cpp
+++ b/engines/sword25/util/lua/ldebug.cpp
@@ -394,7 +394,7 @@ static Instruction symbexec (const Proto *pt, int lastpc, int reg) {
       case OP_FORLOOP:
       case OP_FORPREP:
         checkreg(pt, a+3);
-        /* go through */
+        /* fall through */
       case OP_JMP: {
         int dest = pc+1+b;
         /* not full check and jump is forward and do not skip `lastpc'? */


Commit: a57c5b385decbd4c1bf15f2eace01bf7cb33f246
    https://github.com/scummvm/scummvm/commit/a57c5b385decbd4c1bf15f2eace01bf7cb33f246
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2017-08-06T16:42:40+02:00

Commit Message:
SWORD25: Increase buffer length to silence GCC 7 warning

Changed paths:
    engines/sword25/util/lua/liolib.cpp


diff --git a/engines/sword25/util/lua/liolib.cpp b/engines/sword25/util/lua/liolib.cpp
index 403dea2..20d7164 100644
--- a/engines/sword25/util/lua/liolib.cpp
+++ b/engines/sword25/util/lua/liolib.cpp
@@ -440,7 +440,7 @@ static int g_write (lua_State *L, Sword25::Sword25FileProxy *f, int arg) {
     if (lua_type(L, arg) == LUA_TNUMBER) {
       // optimization: could be done exactly as for strings
 	  if (status) {
-        char buffer[20];
+        char buffer[22];
 		sprintf(buffer, LUA_NUMBER_FMT, lua_tonumber(L, arg));
 		status = f->write(buffer, strlen(buffer)) == strlen(buffer);
 	  }


Commit: 665f5c99b2ca3db67f75ecfa683389e213d942a6
    https://github.com/scummvm/scummvm/commit/665f5c99b2ca3db67f75ecfa683389e213d942a6
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2017-08-06T16:54:38+02:00

Commit Message:
JANITORIAL: Silence some more GCC 7 fall through warnings

I think these are the last one that were already flagged as being
deliberate.

Changed paths:
    audio/mods/tfmx.cpp
    audio/softsynth/mt32/Synth.cpp
    audio/softsynth/opl/dbopl.cpp
    backends/networking/sdl_net/localwebserver.cpp
    engines/sword25/util/lua/ltable.cpp
    gui/editgamedialog.cpp


diff --git a/audio/mods/tfmx.cpp b/audio/mods/tfmx.cpp
index db3dad8..8d31faa 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 00832c5..3a478b5 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 43eb40e..19be94c 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 5ddeb5e..81362ea 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], "<html><head><title>ScummVM - Bad Request</title></head><body>BAD REQUEST</body></html>", 400);
diff --git a/engines/sword25/util/lua/ltable.cpp b/engines/sword25/util/lua/ltable.cpp
index 45381fe..76de991 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 85b3792..94c74b4 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);
 	}





More information about the Scummvm-git-logs mailing list