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/Modules/zselect.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/Modules/zselect.c')
| -rw-r--r-- | Src/Modules/zselect.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/Src/Modules/zselect.c b/Src/Modules/zselect.c index 71a0d7e76..4e547a47e 100644 --- a/Src/Modules/zselect.c +++ b/Src/Modules/zselect.c @@ -43,12 +43,12 @@ handle_digits(char *nam, char *argptr, fd_set *fdset, int *fdmax) char *endptr; if (!idigit(*argptr)) { - zwarnnam(nam, "expecting file descriptor: %s", argptr, 0); + zwarnnam(nam, "expecting file descriptor: %s", argptr); return 1; } fd = (int)zstrtol(argptr, &endptr, 10); if (*endptr) { - zwarnnam(nam, "garbage after file descriptor: %s", endptr, 0); + zwarnnam(nam, "garbage after file descriptor: %s", endptr); return 1; } @@ -95,12 +95,11 @@ bin_zselect(char *nam, char **args, UNUSED(Options ops), UNUSED(int func)) else if (args[1]) { argptr = *++args; } else { - zwarnnam(nam, "argument expected after -%c", NULL, - *argptr); + zwarnnam(nam, "argument expected after -%c", *argptr); return 1; } if (idigit(*argptr) || !isident(argptr)) { - zwarnnam(nam, "invalid array name: %s", argptr, 0); + zwarnnam(nam, "invalid array name: %s", argptr); return 1; } if (i == 'a') @@ -138,18 +137,17 @@ bin_zselect(char *nam, char **args, UNUSED(Options ops), UNUSED(int func)) else if (args[1]) { argptr = *++args; } else { - zwarnnam(nam, "argument expected after -%c", NULL, - *argptr); + zwarnnam(nam, "argument expected after -%c", *argptr); return 1; } if (!idigit(*argptr)) { - zwarnnam(nam, "number expected after -t", NULL, 0); + zwarnnam(nam, "number expected after -t"); return 1; } tempnum = zstrtol(argptr, &endptr, 10); if (*endptr) { zwarnnam(nam, "garbage after -t argument: %s", - endptr, 0); + endptr); return 1; } /* timevalue now active */ @@ -180,7 +178,7 @@ bin_zselect(char *nam, char **args, UNUSED(Options ops), UNUSED(int func)) if (i <= 0) { if (i < 0) - zwarnnam(nam, "error on select: %e", NULL, errno); + zwarnnam(nam, "error on select: %e", errno); /* else no fd's set. Presumably a timeout. */ return 1; } @@ -264,8 +262,7 @@ bin_zselect(char *nam, char **args, UNUSED(Options ops), UNUSED(int func)) return 0; #else /* TODO: use poll */ - zerrnam(nam, "your system does not implement the select system call.", - NULL, 0); + zerrnam(nam, "your system does not implement the select system call."); return 2; #endif } |