aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorEugene Sandulenko2013-04-24 01:40:46 +0300
committerEugene Sandulenko2013-04-24 01:40:46 +0300
commit03882de79b4fb9ebb995507f136e79db425d8377 (patch)
treea767c5cc8fe50fe38272b507c5775d931a5d6053 /base
parent3c0c6a5cb140b7ff84bbd5ba0fda6c5ddac68a09 (diff)
downloadscummvm-rg350-03882de79b4fb9ebb995507f136e79db425d8377.tar.gz
scummvm-rg350-03882de79b4fb9ebb995507f136e79db425d8377.tar.bz2
scummvm-rg350-03882de79b4fb9ebb995507f136e79db425d8377.zip
BASE: Fixed code flow warnings. CID 1002239
Diffstat (limited to 'base')
-rw-r--r--base/commandLine.cpp20
1 files changed, 12 insertions, 8 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index f6d1f1f702..1890513384 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -332,6 +332,10 @@ void registerDefaults() {
continue; \
}
+// End an option handler
+#define END_COMMAND \
+ }
+
Common::String parseCommandLine(Common::StringMap &settings, int argc, const char * const *argv) {
const char *s, *s2;
@@ -366,27 +370,27 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
bool isLongCmd = (s[0] == '-' && s[1] == '-');
DO_COMMAND('h', "help")
- END_OPTION
+ END_COMMAND
DO_COMMAND('v', "version")
- END_OPTION
+ END_COMMAND
DO_COMMAND('t', "list-targets")
- END_OPTION
+ END_COMMAND
DO_COMMAND('z', "list-games")
- END_OPTION
+ END_COMMAND
#ifdef DETECTOR_TESTING_HACK
// HACK FIXME TODO: This command is intentionally *not* documented!
DO_LONG_COMMAND("test-detector")
- END_OPTION
+ END_COMMAND
#endif
#ifdef UPGRADE_ALL_TARGETS_HACK
// HACK FIXME TODO: This command is intentionally *not* documented!
DO_LONG_COMMAND("upgrade-targets")
- END_OPTION
+ END_COMMAND
#endif
DO_LONG_OPTION("list-saves")
@@ -412,7 +416,7 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
END_OPTION
DO_LONG_COMMAND("list-audio-devices")
- END_OPTION
+ END_COMMAND
DO_LONG_OPTION_INT("output-rate")
END_OPTION
@@ -542,7 +546,7 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
END_OPTION
DO_LONG_COMMAND("list-themes")
- END_OPTION
+ END_COMMAND
DO_LONG_OPTION("target-md5")
END_OPTION