diff options
| author | Christoph Mallon | 2011-06-23 16:34:31 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-06-23 17:17:11 +0200 |
| commit | 52ebc0da38856c3105d58920ced048e024fda1d7 (patch) | |
| tree | c4709ad5f7da925aef6775145d5f2110154d7d46 | |
| parent | 712af61f76148095cd3b8762eeb2b2b10502df1f (diff) | |
| download | scummvm-rg350-52ebc0da38856c3105d58920ced048e024fda1d7.tar.gz scummvm-rg350-52ebc0da38856c3105d58920ced048e024fda1d7.tar.bz2 scummvm-rg350-52ebc0da38856c3105d58920ced048e024fda1d7.zip | |
BASE: Correct usage of strtol().
- endptr needs not be initialised before calling strtol(), it is always set by strtol().
- endptr is never a null pointer after calling strtol().
- There is no need to rely on strtol() setting EINVAL (which is not guaranteed).
Testing whether strtol() parsed till the end of the string is sufficient (it is guaranteed that the string is not empty at this point).
- It is sufficient to just test for ERANGE without inspecting the return value, because a successful call to strtol() does not change errno.
Signed-off-by: Alyssa Milburn <fuzzie@fuzzie.org>
| -rw-r--r-- | base/commandLine.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 2620d69ba2..543511696f 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -26,7 +26,6 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_exit #include <errno.h> -#include <limits.h> #include "engines/metaengine.h" #include "base/commandLine.h" @@ -269,10 +268,10 @@ void registerDefaults() { // Use this for options which have a required integer value #define DO_OPTION_INT(shortCmd, longCmd) \ DO_OPTION(shortCmd, longCmd) \ - char *endptr = 0; \ + char *endptr; \ errno = 0; \ - long int retval = strtol(option, &endptr, 0); \ - if (endptr == NULL || *endptr != 0 || (errno != 0 && retval == 0) || (errno == ERANGE && (retval == LONG_MAX || retval == LONG_MIN))) \ + strtol(option, &endptr, 0); \ + if (*endptr != '\0' || errno == ERANGE) \ usage("--%s: Invalid number '%s'", longCmd, option); // Use this for boolean options; this distinguishes between "-x" and "-X", |