RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-14 15:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: arg: improve wording on error reporting

Browse Source 
We make the distinction between missing too many arguments and no
arguments supported.
This commit is contained in:
Willy Tarreau 2013-12-13 00:38:47 +01:00
parent 975c1784c8
commit b111d42d45
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/arg.c
View File

@ -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;
}