From owner-svn-src-head@FreeBSD.ORG  Sun Mar  6 19:50:47 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E13531065674;
	Sun,  6 Mar 2011 19:50:47 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B5C7D8FC20;
	Sun,  6 Mar 2011 19:50:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p26JolQN007955;
	Sun, 6 Mar 2011 19:50:47 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p26Jolbt007952;
	Sun, 6 Mar 2011 19:50:47 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201103061950.p26Jolbt007952@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 6 Mar 2011 19:50:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219347 - in head/usr.bin: killall truss
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Mar 2011 19:50:48 -0000

Author: jilles
Date: Sun Mar  6 19:50:47 2011
New Revision: 219347
URL: http://svn.freebsd.org/changeset/base/219347

Log:
  Simplify various code that allowed for sys_signame being lower case.
  
  This was changed in r218285.

Modified:
  head/usr.bin/killall/killall.c
  head/usr.bin/truss/main.c

Modified: head/usr.bin/killall/killall.c
==============================================================================
--- head/usr.bin/killall/killall.c	Sun Mar  6 19:47:46 2011	(r219346)
+++ head/usr.bin/killall/killall.c	Sun Mar  6 19:50:47 2011	(r219347)
@@ -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;
 			}
 		}

Modified: head/usr.bin/truss/main.c
==============================================================================
--- head/usr.bin/truss/main.c	Sun Mar  6 19:47:46 2011	(r219346)
+++ head/usr.bin/truss/main.c	Sun Mar  6 19:50:47 2011	(r219347)
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/wait.h>
 
-#include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -154,12 +153,9 @@ strsig(int sig)
 
 	ret = NULL;
 	if (sig > 0 && sig < NSIG) {
-		int i;
 		asprintf(&ret, "SIG%s", sys_signame[sig]);
 		if (ret == NULL)
 			return (NULL);
-		for (i = 0; ret[i] != '\0'; ++i)
-			ret[i] = toupper(ret[i]);
 	}
 	return (ret);
 }