From owner-svn-src-head@FreeBSD.ORG  Sun Nov  6 16:40:17 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 7EE78106567E;
	Sun,  6 Nov 2011 16:40:17 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6EED08FC13;
	Sun,  6 Nov 2011 16:40:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA6GeH4a030583;
	Sun, 6 Nov 2011 16:40:17 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA6GeHvF030581;
	Sun, 6 Nov 2011 16:40:17 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201111061640.pA6GeHvF030581@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 6 Nov 2011 16:40:17 +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: r227223 - head/usr.sbin/chroot
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 Nov 2011 16:40:17 -0000

Author: ed
Date: Sun Nov  6 16:40:17 2011
New Revision: 227223
URL: http://svn.freebsd.org/changeset/base/227223

Log:
  Eliminate global variables.
  
  There is no reason why these three variables should be declared as
  global variables, while the others aren't. They are only used inside
  main().

Modified:
  head/usr.sbin/chroot/chroot.c

Modified: head/usr.sbin/chroot/chroot.c
==============================================================================
--- head/usr.sbin/chroot/chroot.c	Sun Nov  6 16:37:50 2011	(r227222)
+++ head/usr.sbin/chroot/chroot.c	Sun Nov  6 16:40:17 2011	(r227223)
@@ -56,16 +56,12 @@ __FBSDID("$FreeBSD$");
 
 static void usage(void);
 
-char	*user;		/* user to switch to before running program */
-char	*group;		/* group to switch to ... */
-char	*grouplist;	/* group list to switch to ... */
-
 int
 main(int argc, char *argv[])
 {
 	struct group	*gp;
 	struct passwd	*pw;
-	char		*endp, *p;
+	char		*endp, *p, *user, *group, *grouplist;
 	const char	*shell;
 	gid_t		gid, *gidlist;
 	uid_t		uid;
@@ -74,6 +70,7 @@ main(int argc, char *argv[])
 
 	gid = 0;
 	uid = 0;
+	user = group = grouplist = NULL;
 	while ((ch = getopt(argc, argv, "G:g:u:")) != -1) {
 		switch(ch) {
 		case 'u':