From 0524ff6e8ddf5611d289831f88432c5d59722948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Fr=C3=BChwirth?= Date: Fri, 23 Mar 2018 18:34:17 +0100 Subject: [PATCH] JANITORIAL: Silence GCC 7 fallthrough warnings --- engines/lastexpress/menu/menu.cpp | 2 +- engines/sword25/util/lua/llex.cpp | 6 ++++-- engines/sword25/util/lua/lstrlib.cpp | 6 ++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/engines/lastexpress/menu/menu.cpp b/engines/lastexpress/menu/menu.cpp index cbd2a4a8193..3a17cec6dfc 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 423f0285ca7..ebda9ffbdf5 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 5da45e1feac..78122030f99 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 "