From: Willy Tarreau <w@1wt.eu>
Date: Thu, 12 Dec 2013 23:38:47 +0000 (+0100)
Subject: MINOR: arg: improve wording on error reporting
X-Git-Tag: v1.5-dev20~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b111d42d454a6dc170d42ad462a8d391c6dcef81;p=thirdparty%2Fhaproxy.git

MINOR: arg: improve wording on error reporting

We make the distinction between missing too many arguments and no
arguments supported.
---

diff --git a/src/arg.c b/src/arg.c
index e7bed1ed9d..edaeee7607 100644
--- a/src/arg.c
+++ b/src/arg.c
@@ -263,7 +263,7 @@ int make_arg_list(const char *in, int len, unsigned int mask, struct arg **argp,
 	if (pos < min_arg) {
 		/* not enough arguments */
 		memprintf(err_msg,
-		          "Missing arguments (got %d/%d), type '%s' expected",
+		          "missing arguments (got %d/%d), type '%s' expected",
 		          pos, min_arg, arg_type_names[(mask >> (pos * 4)) & 15]);
 		goto err;
 	}
@@ -272,8 +272,11 @@ int make_arg_list(const char *in, int len, unsigned int mask, struct arg **argp,
 		/* too many arguments, starting at <in> */
 		/* the caller is responsible for freeing this message */
 		word = my_strndup(in, len);
-		memprintf(err_msg, "end of arguments expected at position %d, but got '%s'",
-		          pos + 1, word);
+		if (nbarg)
+			memprintf(err_msg, "end of arguments expected at position %d, but got '%s'",
+			          pos + 1, word);
+		else
+			memprintf(err_msg, "no argument supported, but got '%s'", word);
 		free(word); word = NULL;
 		goto err;
 	}