[Scummvm-git-logs] scummvm master -> 0524ff6e8ddf5611d289831f88432c5d59722948

bonki bonki at users.noreply.github.com
Fri Mar 23 18:36:04 CET 2018


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

Summary:
0524ff6e8d JANITORIAL: Silence GCC 7 fallthrough warnings


Commit: 0524ff6e8ddf5611d289831f88432c5d59722948
    https://github.com/scummvm/scummvm/commit/0524ff6e8ddf5611d289831f88432c5d59722948
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-03-23T18:34:17+01:00

Commit Message:
JANITORIAL: Silence GCC 7 fallthrough warnings

Changed paths:
    engines/lastexpress/menu/menu.cpp
    engines/sword25/util/lua/llex.cpp
    engines/sword25/util/lua/lstrlib.cpp


diff --git a/engines/lastexpress/menu/menu.cpp b/engines/lastexpress/menu/menu.cpp
index cbd2a4a..3a17cec 100644
--- a/engines/lastexpress/menu/menu.cpp
+++ b/engines/lastexpress/menu/menu.cpp
@@ -434,7 +434,7 @@ bool Menu::handleEvent(StartMenuAction action, Common::EventType type) {
 	case kMenuCase4:
 		if (clicked)
 			_index = 0;
-		// fall down to kMenuContinue
+		// fall through
 
 	//////////////////////////////////////////////////////////////////////////
 	case kMenuContinue: {
diff --git a/engines/sword25/util/lua/llex.cpp b/engines/sword25/util/lua/llex.cpp
index 423f028..ebda9ff 100644
--- a/engines/sword25/util/lua/llex.cpp
+++ b/engines/sword25/util/lua/llex.cpp
@@ -377,8 +377,10 @@ static int llex (LexState *ls, SemInfo *seminfo) {
           read_long_string(ls, seminfo, sep);
           return TK_STRING;
         }
-        else if (sep == -1) return '[';
-        else luaX_lexerror(ls, "invalid long string delimiter", TK_STRING);
+        else if (sep == -1)
+          return '[';
+        luaX_lexerror(ls, "invalid long string delimiter", TK_STRING);
+        break;
       }
       case '=': {
         next(ls);
diff --git a/engines/sword25/util/lua/lstrlib.cpp b/engines/sword25/util/lua/lstrlib.cpp
index 5da45e1..7812203 100644
--- a/engines/sword25/util/lua/lstrlib.cpp
+++ b/engines/sword25/util/lua/lstrlib.cpp
@@ -799,10 +799,8 @@ static int str_format (lua_State *L) {
             luaL_addvalue(&b);
             continue;  /* skip the `addsize' at the end */
           }
-          else {
-            sprintf(buff, form, s);
-            break;
-          }
+          sprintf(buff, form, s);
+          break;
         }
         default: {  /* also treat cases `pnLlh' */
           return luaL_error(L, "invalid option " LUA_QL("%%%c") " to "





More information about the Scummvm-git-logs mailing list