aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Frühwirth2018-03-23 18:34:17 +0100
committerAdrian Frühwirth2018-03-23 18:34:17 +0100
commit0524ff6e8ddf5611d289831f88432c5d59722948 (patch)
tree62f261c74eabc231ff3cfad24be734b441ffddd1
parent99c72c7b5cf651b83d300e9a8a0a481cfe9b00de (diff)
downloadscummvm-rg350-0524ff6e8ddf5611d289831f88432c5d59722948.tar.gz
scummvm-rg350-0524ff6e8ddf5611d289831f88432c5d59722948.tar.bz2
scummvm-rg350-0524ff6e8ddf5611d289831f88432c5d59722948.zip
JANITORIAL: Silence GCC 7 fallthrough warnings
-rw-r--r--engines/lastexpress/menu/menu.cpp2
-rw-r--r--engines/sword25/util/lua/llex.cpp6
-rw-r--r--engines/sword25/util/lua/lstrlib.cpp6
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/lastexpress/menu/menu.cpp b/engines/lastexpress/menu/menu.cpp
index cbd2a4a819..3a17cec6df 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 423f0285ca..ebda9ffbdf 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 5da45e1fea..78122030f9 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 "