diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2006-05-30 22:35:03 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2006-05-30 22:35:03 +0000 |
| commit | dd5602f59b599177fb130512fc543f7efa951990 (patch) | |
| tree | 93f50c0abbbc61dbea120afb6f497afe6b976fea /Src/options.c | |
| parent | fd240e09b05ca15aa1deef35733124b6852fe809 (diff) | |
| download | zsh-dd5602f59b599177fb130512fc543f7efa951990.tar.gz zsh-dd5602f59b599177fb130512fc543f7efa951990.tar.xz zsh-dd5602f59b599177fb130512fc543f7efa951990.zip | |
22474: use variable argument lists to improve error message handling
Diffstat (limited to 'Src/options.c')
| -rw-r--r-- | Src/options.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Src/options.c b/Src/options.c index bf989adf5..6c3fb26d1 100644 --- a/Src/options.c +++ b/Src/options.c @@ -517,22 +517,22 @@ bin_setopt(char *nam, char **args, UNUSED(Options ops), int isun) if (!*++*args) args++; if (!*args) { - zwarnnam(nam, "string expected after -o", NULL, 0); + zwarnnam(nam, "string expected after -o"); inittyptab(); return 1; } if(!(optno = optlookup(*args))) - zwarnnam(nam, "no such option: %s", *args, 0); + zwarnnam(nam, "no such option: %s", *args); else if(dosetopt(optno, action, 0)) - zwarnnam(nam, "can't change option: %s", *args, 0); + zwarnnam(nam, "can't change option: %s", *args); break; } else if(**args == 'm') { match = 1; } else { if (!(optno = optlookupc(**args))) - zwarnnam(nam, "bad option: -%c", NULL, **args); + zwarnnam(nam, "bad option: -%c", **args); else if(dosetopt(optno, action, 0)) - zwarnnam(nam, "can't change option: -%c", NULL, **args); + zwarnnam(nam, "can't change option: -%c", **args); } } args++; @@ -543,9 +543,9 @@ bin_setopt(char *nam, char **args, UNUSED(Options ops), int isun) /* Not globbing the arguments -- arguments are simply option names. */ while (*args) { if(!(optno = optlookup(*args++))) - zwarnnam(nam, "no such option: %s", args[-1], 0); + zwarnnam(nam, "no such option: %s", args[-1]); else if(dosetopt(optno, !isun, 0)) - zwarnnam(nam, "can't change option: %s", args[-1], 0); + zwarnnam(nam, "can't change option: %s", args[-1]); } } else { /* Globbing option (-m) set. */ @@ -565,7 +565,7 @@ bin_setopt(char *nam, char **args, UNUSED(Options ops), int isun) /* Expand the current arg. */ tokenize(s); if (!(pprog = patcompile(s, PAT_STATIC, NULL))) { - zwarnnam(nam, "bad pattern: %s", *args, 0); + zwarnnam(nam, "bad pattern: %s", *args); continue; } /* Loop over expansions. */ |