diff options
author | jilles <jilles@FreeBSD.org> | 2011-03-06 19:50:47 +0000 |
---|---|---|
committer | jilles <jilles@FreeBSD.org> | 2011-03-06 19:50:47 +0000 |
commit | f046771b043f97ce73ec41945b3cba415de5e51e (patch) | |
tree | 7aaa71e2355dcbf9728fcac1d7dc084775764b64 /usr.bin/killall | |
parent | afeb46924f240d98faa8d6db6392cea23842af0a (diff) | |
download | FreeBSD-src-f046771b043f97ce73ec41945b3cba415de5e51e.zip FreeBSD-src-f046771b043f97ce73ec41945b3cba415de5e51e.tar.gz |
Simplify various code that allowed for sys_signame being lower case.
This was changed in r218285.
Diffstat (limited to 'usr.bin/killall')
-rw-r--r-- | usr.bin/killall/killall.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c index 2342a32..28496a0 100644 --- a/usr.bin/killall/killall.c +++ b/usr.bin/killall/killall.c @@ -60,18 +60,6 @@ usage(void) exit(1); } -static char * -upper(const char *str) -{ - static char buf[80]; - char *s; - - strlcpy(buf, str, sizeof(buf)); - for (s = buf; *s; s++) - *s = toupper((unsigned char)*s); - return buf; -} - static void printsig(FILE *fp) @@ -81,7 +69,7 @@ printsig(FILE *fp) int offset = 0; for (cnt = NSIG, p = sys_signame + 1; --cnt; ++p) { - offset += fprintf(fp, "%s ", upper(*p)); + offset += fprintf(fp, "%s ", *p); if (offset >= 75 && cnt > 1) { offset = 0; fprintf(fp, "\n"); @@ -401,14 +389,13 @@ main(int ac, char **av) thiscmd, thispid, thistdev, thisuid); if (vflag || sflag) - printf("kill -%s %d\n", upper(sys_signame[sig]), - thispid); + printf("kill -%s %d\n", sys_signame[sig], thispid); killed++; if (!dflag && !sflag) { if (kill(thispid, sig) < 0 /* && errno != ESRCH */ ) { warn("warning: kill -%s %d", - upper(sys_signame[sig]), thispid); + sys_signame[sig], thispid); errors = 1; } } |