From da8097896efd5e74ff7c50e072238fc89de682ba Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 26 May 2007 15:59:54 +0000 Subject: Fix wrong error message as pointed out by jvprat. I.e. ./scummvm -g produced: "Option '(null)' requires an argument" svn-id: r26941 --- base/commandLine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 667e0e29b5..5583eed30a 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -251,12 +251,12 @@ void registerDefaults() { // Use this for options which have a required (string) value #define DO_OPTION(shortCmd, longCmd) \ DO_OPTION_OPT(shortCmd, longCmd, 0) \ - if (!option) usage("Option '%s' requires an argument", argv[i]); + if (!option) usage("Option '%s' requires an argument", argv[i-1]); // Use this for options which have a required integer value #define DO_OPTION_INT(shortCmd, longCmd) \ DO_OPTION_OPT(shortCmd, longCmd, 0) \ - if (!option) usage("Option '%s' requires an argument", argv[i]); \ + if (!option) usage("Option '%s' requires an argument", argv[i-1]); \ char *endptr = 0; \ int intValue; intValue = (int)strtol(option, &endptr, 0); \ if (endptr == NULL || *endptr != 0) usage("--%s: Invalid number '%s'", longCmd, option); -- cgit v1.2.3