Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/chroot Use __dead. Move global variables into funct...



details:   https://anonhg.NetBSD.org/src/rev/96edc682d6cd
branches:  trunk
changeset: 768846:96edc682d6cd
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Aug 27 22:32:44 2011 +0000

description:
Use __dead. Move global variables into function scope.

diffstat:

 usr.sbin/chroot/chroot.c |  16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diffs (48 lines):

diff -r ac334f5b5550 -r 96edc682d6cd usr.sbin/chroot/chroot.c
--- a/usr.sbin/chroot/chroot.c  Sat Aug 27 22:30:44 2011 +0000
+++ b/usr.sbin/chroot/chroot.c  Sat Aug 27 22:32:44 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: chroot.c,v 1.16 2011/08/15 14:43:17 wiz Exp $  */
+/*     $NetBSD: chroot.c,v 1.17 2011/08/27 22:32:44 joerg Exp $        */
 
 /*
  * Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)chroot.c   8.1 (Berkeley) 6/9/93";
 #else
-__RCSID("$NetBSD: chroot.c,v 1.16 2011/08/15 14:43:17 wiz Exp $");
+__RCSID("$NetBSD: chroot.c,v 1.17 2011/08/27 22:32:44 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -56,16 +56,14 @@
 #include <string.h>
 #include <unistd.h>
 
-int    main(int, char **);
-void   usage(void) __dead;
-
-char   *user;          /* user to switch to before running program */
-char   *group;         /* group to switch to ... */
-char   *grouplist;     /* group list to switch to ... */
+static void    usage(void) __dead;
 
 int
 main(int argc, char *argv[])
 {
+       char    *user;          /* user to switch to before running program */
+       char    *group;         /* group to switch to ... */
+       char    *grouplist;     /* group list to switch to ... */
        struct group    *gp;
        struct passwd   *pw;
        char            *endp, *p;
@@ -175,7 +173,7 @@
        /* NOTREACHED */
 }
 
-void
+static void
 usage(void)
 {
 



Home | Main Index | Thread Index | Old Index