Module Name:    src
Committed By:   joerg
Date:           Mon Aug 29 14:35:04 UTC 2011

Modified Files:
        src/sbin/bioctl: bioctl.c
        src/sbin/cgdconfig: cgdconfig.c
        src/sbin/chown: chown.c
        src/sbin/disklabel: main.c
        src/sbin/dmesg: dmesg.c
        src/sbin/drvctl: drvctl.c
        src/sbin/dump: dumprmt.c
        src/sbin/fsck_ffs: main.c
        src/sbin/fsdb: fsdb.c
        src/sbin/ifconfig: ifconfig.c media.c
        src/sbin/mount: mount.c
        src/sbin/mount_ados: mount_ados.c
        src/sbin/mount_cd9660: mount_cd9660.c
        src/sbin/mount_efs: mount_efs.c
        src/sbin/mount_ext2fs: mount_ext2fs.c
        src/sbin/mount_fdesc: mount_fdesc.c
        src/sbin/mount_ffs: mount_ffs.c
        src/sbin/mount_filecore: mount_filecore.c
        src/sbin/mount_hfs: mount_hfs.c
        src/sbin/mount_kernfs: mount_kernfs.c
        src/sbin/mount_lfs: mount_lfs.c
        src/sbin/mount_nfs: mount_nfs.c
        src/sbin/mount_null: mount_null.c
        src/sbin/mount_overlay: mount_overlay.c
        src/sbin/mount_portal: puffs_portal.c
        src/sbin/mount_procfs: mount_procfs.c
        src/sbin/mount_ptyfs: mount_ptyfs.c
        src/sbin/mount_puffs: mount_puffs.c
        src/sbin/mount_sysvbfs: mount_sysvbfs.c
        src/sbin/mount_umap: mount_umap.c
        src/sbin/mount_union: mount_union.c
        src/sbin/newfs_msdos: newfs_msdos.c
        src/sbin/newfs_sysvbfs: newfs_sysvbfs.c
        src/sbin/raidctl: raidctl.c
        src/sbin/restore: main.c tape.c
        src/sbin/route: route.c
        src/sbin/routed: defs.h
        src/sbin/routed/rtquery: rtquery.c
        src/sbin/scsictl: scsictl.c
        src/sbin/sysctl: sysctl.c
        src/sbin/tunefs: tunefs.c
        src/sbin/veriexecctl: veriexecctl.c

Log Message:
Use __dead


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sbin/bioctl/bioctl.c
cvs rdiff -u -r1.32 -r1.33 src/sbin/cgdconfig/cgdconfig.c
cvs rdiff -u -r1.4 -r1.5 src/sbin/chown/chown.c
cvs rdiff -u -r1.24 -r1.25 src/sbin/disklabel/main.c
cvs rdiff -u -r1.26 -r1.27 src/sbin/dmesg/dmesg.c
cvs rdiff -u -r1.12 -r1.13 src/sbin/drvctl/drvctl.c
cvs rdiff -u -r1.33 -r1.34 src/sbin/dump/dumprmt.c
cvs rdiff -u -r1.79 -r1.80 src/sbin/fsck_ffs/main.c
cvs rdiff -u -r1.42 -r1.43 src/sbin/fsdb/fsdb.c
cvs rdiff -u -r1.225 -r1.226 src/sbin/ifconfig/ifconfig.c
cvs rdiff -u -r1.5 -r1.6 src/sbin/ifconfig/media.c
cvs rdiff -u -r1.92 -r1.93 src/sbin/mount/mount.c
cvs rdiff -u -r1.28 -r1.29 src/sbin/mount_ados/mount_ados.c
cvs rdiff -u -r1.31 -r1.32 src/sbin/mount_cd9660/mount_cd9660.c
cvs rdiff -u -r1.4 -r1.5 src/sbin/mount_efs/mount_efs.c
cvs rdiff -u -r1.21 -r1.22 src/sbin/mount_ext2fs/mount_ext2fs.c
cvs rdiff -u -r1.25 -r1.26 src/sbin/mount_fdesc/mount_fdesc.c
cvs rdiff -u -r1.26 -r1.27 src/sbin/mount_ffs/mount_ffs.c
cvs rdiff -u -r1.19 -r1.20 src/sbin/mount_filecore/mount_filecore.c
cvs rdiff -u -r1.8 -r1.9 src/sbin/mount_hfs/mount_hfs.c
cvs rdiff -u -r1.24 -r1.25 src/sbin/mount_kernfs/mount_kernfs.c
cvs rdiff -u -r1.33 -r1.34 src/sbin/mount_lfs/mount_lfs.c
cvs rdiff -u -r1.68 -r1.69 src/sbin/mount_nfs/mount_nfs.c
cvs rdiff -u -r1.18 -r1.19 src/sbin/mount_null/mount_null.c
cvs rdiff -u -r1.12 -r1.13 src/sbin/mount_overlay/mount_overlay.c
cvs rdiff -u -r1.3 -r1.4 src/sbin/mount_portal/puffs_portal.c
cvs rdiff -u -r1.23 -r1.24 src/sbin/mount_procfs/mount_procfs.c
cvs rdiff -u -r1.11 -r1.12 src/sbin/mount_ptyfs/mount_ptyfs.c
cvs rdiff -u -r1.3 -r1.4 src/sbin/mount_puffs/mount_puffs.c
cvs rdiff -u -r1.7 -r1.8 src/sbin/mount_sysvbfs/mount_sysvbfs.c
cvs rdiff -u -r1.22 -r1.23 src/sbin/mount_umap/mount_umap.c
cvs rdiff -u -r1.21 -r1.22 src/sbin/mount_union/mount_union.c
cvs rdiff -u -r1.35 -r1.36 src/sbin/newfs_msdos/newfs_msdos.c
cvs rdiff -u -r1.7 -r1.8 src/sbin/newfs_sysvbfs/newfs_sysvbfs.c
cvs rdiff -u -r1.52 -r1.53 src/sbin/raidctl/raidctl.c
cvs rdiff -u -r1.33 -r1.34 src/sbin/restore/main.c
cvs rdiff -u -r1.65 -r1.66 src/sbin/restore/tape.c
cvs rdiff -u -r1.131 -r1.132 src/sbin/route/route.c
cvs rdiff -u -r1.25 -r1.26 src/sbin/routed/defs.h
cvs rdiff -u -r1.22 -r1.23 src/sbin/routed/rtquery/rtquery.c
cvs rdiff -u -r1.32 -r1.33 src/sbin/scsictl/scsictl.c
cvs rdiff -u -r1.137 -r1.138 src/sbin/sysctl/sysctl.c
cvs rdiff -u -r1.43 -r1.44 src/sbin/tunefs/tunefs.c
cvs rdiff -u -r1.34 -r1.35 src/sbin/veriexecctl/veriexecctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/bioctl/bioctl.c
diff -u src/sbin/bioctl/bioctl.c:1.14 src/sbin/bioctl/bioctl.c:1.15
--- src/sbin/bioctl/bioctl.c:1.14	Wed May 25 15:34:19 2011
+++ src/sbin/bioctl/bioctl.c	Mon Aug 29 14:34:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bioctl.c,v 1.14 2011/05/25 15:34:19 joerg Exp $ */
+/* $NetBSD: bioctl.c,v 1.15 2011/08/29 14:34:58 joerg Exp $ */
 /* $OpenBSD: bioctl.c,v 1.52 2007/03/20 15:26:06 jmc Exp $ */
 
 /*
@@ -31,7 +31,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: bioctl.c,v 1.14 2011/05/25 15:34:19 joerg Exp $");
+__RCSID("$NetBSD: bioctl.c,v 1.15 2011/08/29 14:34:58 joerg Exp $");
 #endif
 
 #include <sys/types.h>
@@ -76,7 +76,7 @@
 	int lun;
 };
 
-static void 	usage(void);
+__dead static void 	usage(void);
 static void	bio_alarm(int, int, char **);
 static void	bio_show_common(int, int, char **);
 static int	bio_show_volumes(struct biotmp *);

Index: src/sbin/cgdconfig/cgdconfig.c
diff -u src/sbin/cgdconfig/cgdconfig.c:1.32 src/sbin/cgdconfig/cgdconfig.c:1.33
--- src/sbin/cgdconfig/cgdconfig.c:1.32	Tue Dec 14 17:46:21 2010
+++ src/sbin/cgdconfig/cgdconfig.c	Mon Aug 29 14:34:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdconfig.c,v 1.32 2010/12/14 17:46:21 pooka Exp $ */
+/* $NetBSD: cgdconfig.c,v 1.33 2011/08/29 14:34:59 joerg Exp $ */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 2002, 2003\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: cgdconfig.c,v 1.32 2010/12/14 17:46:21 pooka Exp $");
+__RCSID("$NetBSD: cgdconfig.c,v 1.33 2011/08/29 14:34:59 joerg Exp $");
 #endif
 
 #include <err.h>
@@ -114,7 +114,7 @@
 static int	 verify_ffs(int);
 static int	 verify_reenter(struct params *);
 
-static void	 usage(void);
+__dead static void	 usage(void);
 
 /* Verbose Framework */
 unsigned	verbose = 0;

Index: src/sbin/chown/chown.c
diff -u src/sbin/chown/chown.c:1.4 src/sbin/chown/chown.c:1.5
--- src/sbin/chown/chown.c:1.4	Thu Jan 13 22:28:36 2011
+++ src/sbin/chown/chown.c	Mon Aug 29 14:34:59 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: chown.c,v 1.4 2011/01/13 22:28:36 haad Exp $	*/
+/*	$NetBSD: chown.c,v 1.5 2011/08/29 14:34:59 joerg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993, 1994, 2003
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)chown.c	8.8 (Berkeley) 4/4/94";
 #else
-__RCSID("$NetBSD: chown.c,v 1.4 2011/01/13 22:28:36 haad Exp $");
+__RCSID("$NetBSD: chown.c,v 1.5 2011/08/29 14:34:59 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -62,7 +62,7 @@
 static void	a_gid(const char *);
 static void	a_uid(const char *);
 static id_t	id(const char *, const char *);
-static void	usage(void);
+__dead static void	usage(void);
 
 static uid_t uid;
 static gid_t gid;

Index: src/sbin/disklabel/main.c
diff -u src/sbin/disklabel/main.c:1.24 src/sbin/disklabel/main.c:1.25
--- src/sbin/disklabel/main.c:1.24	Thu Jan  6 21:39:01 2011
+++ src/sbin/disklabel/main.c	Mon Aug 29 14:34:59 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.24 2011/01/06 21:39:01 apb Exp $	*/
+/*	$NetBSD: main.c,v 1.25 2011/08/29 14:34:59 joerg Exp $	*/
 
 /*
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
 static char sccsid[] = "@(#)disklabel.c	8.4 (Berkeley) 5/4/95";
 /* from static char sccsid[] = "@(#)disklabel.c	1.2 (Symmetric) 11/28/85"; */
 #else
-__RCSID("$NetBSD: main.c,v 1.24 2011/01/06 21:39:01 apb Exp $");
+__RCSID("$NetBSD: main.c,v 1.25 2011/08/29 14:34:59 joerg Exp $");
 #endif
 #endif	/* not lint */
 
@@ -173,7 +173,7 @@
 static char		*skip(char *);
 static char		*word(char *);
 static int		 getasciilabel(FILE *, struct disklabel *);
-static void		 usage(void);
+__dead static void	 usage(void);
 static int		 qsort_strcmp(const void *, const void *);
 static int		 getulong(const char *, char, char **,
     unsigned long *, unsigned long);

Index: src/sbin/dmesg/dmesg.c
diff -u src/sbin/dmesg/dmesg.c:1.26 src/sbin/dmesg/dmesg.c:1.27
--- src/sbin/dmesg/dmesg.c:1.26	Sun Jul 20 01:20:22 2008
+++ src/sbin/dmesg/dmesg.c	Mon Aug 29 14:34:59 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: dmesg.c,v 1.26 2008/07/20 01:20:22 lukem Exp $	*/
+/*	$NetBSD: dmesg.c,v 1.27 2011/08/29 14:34:59 joerg Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)dmesg.c	8.1 (Berkeley) 6/5/93";
 #else
-__RCSID("$NetBSD: dmesg.c,v 1.26 2008/07/20 01:20:22 lukem Exp $");
+__RCSID("$NetBSD: dmesg.c,v 1.27 2011/08/29 14:34:59 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -57,13 +57,13 @@
 #include <vis.h>
 
 #ifndef SMALL
-struct nlist nl[] = {
+static struct nlist nl[] = {
 #define	X_MSGBUF	0
 	{ .n_name = "_msgbufp" },
 	{ .n_name = NULL },
 };
 
-void	usage(void);
+__dead static void	usage(void);
 
 #define	KREAD(addr, var) \
 	kvm_read(kd, addr, &var, sizeof(var)) != sizeof(var)
@@ -193,7 +193,7 @@
 }
 
 #ifndef SMALL
-void
+static void
 usage(void)
 {
 

Index: src/sbin/drvctl/drvctl.c
diff -u src/sbin/drvctl/drvctl.c:1.12 src/sbin/drvctl/drvctl.c:1.13
--- src/sbin/drvctl/drvctl.c:1.12	Sun Aug  7 13:00:35 2011
+++ src/sbin/drvctl/drvctl.c	Mon Aug 29 14:34:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: drvctl.c,v 1.12 2011/08/07 13:00:35 jmcneill Exp $ */
+/* $NetBSD: drvctl.c,v 1.13 2011/08/29 14:34:59 joerg Exp $ */
 
 /*
  * Copyright (c) 2004
@@ -43,7 +43,7 @@
 	(((mode) == 'd' || (mode) == 'r') ? O_RDWR			\
 					  : O_RDONLY)
 
-static void usage(void);
+__dead static void usage(void);
 static void extract_property(prop_dictionary_t, const char *);
 static void list_children(int, char *, bool, bool, int);
 

Index: src/sbin/dump/dumprmt.c
diff -u src/sbin/dump/dumprmt.c:1.33 src/sbin/dump/dumprmt.c:1.34
--- src/sbin/dump/dumprmt.c:1.33	Sat Apr 11 07:55:35 2009
+++ src/sbin/dump/dumprmt.c	Mon Aug 29 14:34:59 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: dumprmt.c,v 1.33 2009/04/11 07:55:35 lukem Exp $	*/
+/*	$NetBSD: dumprmt.c,v 1.34 2011/08/29 14:34:59 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)dumprmt.c	8.3 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: dumprmt.c,v 1.33 2009/04/11 07:55:35 lukem Exp $");
+__RCSID("$NetBSD: dumprmt.c,v 1.34 2011/08/29 14:34:59 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -75,7 +75,7 @@
 
 static	int	okname(char *);
 static	int	rmtcall(const char *, const char *, int);
-static	void	rmtconnaborted(int);
+__dead static	void	rmtconnaborted(int);
 static	int	rmtgetb(void);
 static	void	rmtgetconn(void);
 static	void	rmtgets(char *, int);

Index: src/sbin/fsck_ffs/main.c
diff -u src/sbin/fsck_ffs/main.c:1.79 src/sbin/fsck_ffs/main.c:1.80
--- src/sbin/fsck_ffs/main.c:1.79	Thu Jun  9 19:57:52 2011
+++ src/sbin/fsck_ffs/main.c	Mon Aug 29 14:34:59 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.79 2011/06/09 19:57:52 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.80 2011/08/29 14:34:59 joerg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.79 2011/06/09 19:57:52 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.80 2011/08/29 14:34:59 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -75,7 +75,7 @@
 
 static int	argtoi(int, const char *, const char *, int);
 static int	checkfilesys(const char *, const char *, int);
-static void	usage(void);
+__dead static void	usage(void);
 
 int
 main(int argc, char *argv[])

Index: src/sbin/fsdb/fsdb.c
diff -u src/sbin/fsdb/fsdb.c:1.42 src/sbin/fsdb/fsdb.c:1.43
--- src/sbin/fsdb/fsdb.c:1.42	Sun Aug 14 12:30:04 2011
+++ src/sbin/fsdb/fsdb.c	Mon Aug 29 14:34:59 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: fsdb.c,v 1.42 2011/08/14 12:30:04 christos Exp $	*/
+/*	$NetBSD: fsdb.c,v 1.43 2011/08/29 14:34:59 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fsdb.c,v 1.42 2011/08/14 12:30:04 christos Exp $");
+__RCSID("$NetBSD: fsdb.c,v 1.43 2011/08/29 14:34:59 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -61,7 +61,7 @@
 #include "fsck.h"
 #include "extern.h"
 
-static void usage(void);
+__dead static void usage(void);
 static int cmdloop(void);
 static char *prompt(EditLine *);
 static int scannames(struct inodesc *);

Index: src/sbin/ifconfig/ifconfig.c
diff -u src/sbin/ifconfig/ifconfig.c:1.225 src/sbin/ifconfig/ifconfig.c:1.226
--- src/sbin/ifconfig/ifconfig.c:1.225	Tue Dec 14 10:51:51 2010
+++ src/sbin/ifconfig/ifconfig.c	Mon Aug 29 14:35:00 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ifconfig.c,v 1.225 2010/12/14 10:51:51 pooka Exp $	*/
+/*	$NetBSD: ifconfig.c,v 1.226 2011/08/29 14:35:00 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1993\
  The Regents of the University of California.  All rights reserved.");
-__RCSID("$NetBSD: ifconfig.c,v 1.225 2010/12/14 10:51:51 pooka Exp $");
+__RCSID("$NetBSD: ifconfig.c,v 1.226 2011/08/29 14:35:00 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -131,7 +131,7 @@
 static int unsetlinkstr(prop_dictionary_t, prop_dictionary_t);
 static void status(const struct sockaddr *, prop_dictionary_t,
     prop_dictionary_t);
-static void usage(void);
+__dead static void usage(void);
 
 static const struct kwinst ifflagskw[] = {
 	  IFKW("arp", -IFF_NOARP)

Index: src/sbin/ifconfig/media.c
diff -u src/sbin/ifconfig/media.c:1.5 src/sbin/ifconfig/media.c:1.6
--- src/sbin/ifconfig/media.c:1.5	Mon Dec 13 17:35:08 2010
+++ src/sbin/ifconfig/media.c	Mon Aug 29 14:35:00 2011
@@ -1,6 +1,6 @@
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: media.c,v 1.5 2010/12/13 17:35:08 pooka Exp $");
+__RCSID("$NetBSD: media.c,v 1.6 2011/08/29 14:35:00 joerg Exp $");
 #endif /* not lint */
 
 #include <assert.h>
@@ -92,7 +92,7 @@
 struct pkw kwmedia = PKW_INITIALIZER(&kwmedia, "media keywords", NULL, NULL,
     mediakw, __arraycount(mediakw), NULL);
 
-static void
+__dead static void
 media_error(int type, const char *val, const char *opt)
 {
 	errx(EXIT_FAILURE, "unknown %s media %s: %s",

Index: src/sbin/mount/mount.c
diff -u src/sbin/mount/mount.c:1.92 src/sbin/mount/mount.c:1.93
--- src/sbin/mount/mount.c:1.92	Thu Jan 13 11:57:02 2011
+++ src/sbin/mount/mount.c	Mon Aug 29 14:35:00 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount.c,v 1.92 2011/01/13 11:57:02 pooka Exp $	*/
+/*	$NetBSD: mount.c,v 1.93 2011/08/29 14:35:00 joerg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1989, 1993, 1994
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)mount.c	8.25 (Berkeley) 5/8/95";
 #else
-__RCSID("$NetBSD: mount.c,v 1.92 2011/01/13 11:57:02 pooka Exp $");
+__RCSID("$NetBSD: mount.c,v 1.93 2011/08/29 14:35:00 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -81,7 +81,7 @@
 static int	mountfs(const char *, const char *, const char *,
 		    int, const char *, const char *, int, char *, size_t);
 static void	prmount(struct statvfs *);
-static void	usage(void);
+__dead static void	usage(void);
 
 
 /* Map from mount otions to printable formats. */

Index: src/sbin/mount_ados/mount_ados.c
diff -u src/sbin/mount_ados/mount_ados.c:1.28 src/sbin/mount_ados/mount_ados.c:1.29
--- src/sbin/mount_ados/mount_ados.c:1.28	Tue Aug  5 20:57:45 2008
+++ src/sbin/mount_ados/mount_ados.c	Mon Aug 29 14:35:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_ados.c,v 1.28 2008/08/05 20:57:45 pooka Exp $ */
+/* $NetBSD: mount_ados.c,v 1.29 2011/08/29 14:35:00 joerg Exp $ */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mount_ados.c,v 1.28 2008/08/05 20:57:45 pooka Exp $");
+__RCSID("$NetBSD: mount_ados.c,v 1.29 2011/08/29 14:35:00 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -65,7 +65,7 @@
 };
 
 int	mount_ados(int argc, char **argv);
-static void	usage(void);
+__dead static void	usage(void);
 
 #ifndef MOUNT_NOMAIN
 int

Index: src/sbin/mount_cd9660/mount_cd9660.c
diff -u src/sbin/mount_cd9660/mount_cd9660.c:1.31 src/sbin/mount_cd9660/mount_cd9660.c:1.32
--- src/sbin/mount_cd9660/mount_cd9660.c:1.31	Wed Oct  7 20:42:09 2009
+++ src/sbin/mount_cd9660/mount_cd9660.c	Mon Aug 29 14:35:00 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_cd9660.c,v 1.31 2009/10/07 20:42:09 pooka Exp $	*/
+/*	$NetBSD: mount_cd9660.c,v 1.32 2011/08/29 14:35:00 joerg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_cd9660.c	8.7 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: mount_cd9660.c,v 1.31 2009/10/07 20:42:09 pooka Exp $");
+__RCSID("$NetBSD: mount_cd9660.c,v 1.32 2011/08/29 14:35:00 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -82,7 +82,7 @@
 	MOPT_NULL,
 };
 
-static void	usage(void);
+__dead static void	usage(void);
 
 #ifndef MOUNT_NOMAIN
 int

Index: src/sbin/mount_efs/mount_efs.c
diff -u src/sbin/mount_efs/mount_efs.c:1.4 src/sbin/mount_efs/mount_efs.c:1.5
--- src/sbin/mount_efs/mount_efs.c:1.4	Tue Aug  5 20:57:45 2008
+++ src/sbin/mount_efs/mount_efs.c	Mon Aug 29 14:35:00 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_efs.c,v 1.4 2008/08/05 20:57:45 pooka Exp $	*/
+/*	$NetBSD: mount_efs.c,v 1.5 2011/08/29 14:35:00 joerg Exp $	*/
 
 /*
  * Copyright (c) 2006 Stephen M. Rumble <[email protected]>
@@ -41,10 +41,10 @@
 	MOPT_NULL
 };
 
-static void	usage(void);
+__dead static void	usage(void);
 
 static void
-usage()
+usage(void)
 {
 	
 	fprintf(stderr, "usage: %s [-o options] special node\n", getprogname());

Index: src/sbin/mount_ext2fs/mount_ext2fs.c
diff -u src/sbin/mount_ext2fs/mount_ext2fs.c:1.21 src/sbin/mount_ext2fs/mount_ext2fs.c:1.22
--- src/sbin/mount_ext2fs/mount_ext2fs.c:1.21	Tue Aug  5 20:57:45 2008
+++ src/sbin/mount_ext2fs/mount_ext2fs.c	Mon Aug 29 14:35:00 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_ext2fs.c,v 1.21 2008/08/05 20:57:45 pooka Exp $	*/
+/*	$NetBSD: mount_ext2fs.c,v 1.22 2011/08/29 14:35:00 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_ufs.c	8.4 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_ext2fs.c,v 1.21 2008/08/05 20:57:45 pooka Exp $");
+__RCSID("$NetBSD: mount_ext2fs.c,v 1.22 2011/08/29 14:35:00 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -60,7 +60,7 @@
 #include "mountprog.h"
 #include "mount_ext2fs.h"
 
-static void	ext2fs_usage(void);
+__dead static void	ext2fs_usage(void);
 
 static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,

Index: src/sbin/mount_fdesc/mount_fdesc.c
diff -u src/sbin/mount_fdesc/mount_fdesc.c:1.25 src/sbin/mount_fdesc/mount_fdesc.c:1.26
--- src/sbin/mount_fdesc/mount_fdesc.c:1.25	Wed Mar 31 13:10:10 2010
+++ src/sbin/mount_fdesc/mount_fdesc.c	Mon Aug 29 14:35:00 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_fdesc.c,v 1.25 2010/03/31 13:10:10 pooka Exp $	*/
+/*	$NetBSD: mount_fdesc.c,v 1.26 2011/08/29 14:35:00 joerg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -77,7 +77,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_fdesc.c	8.3 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_fdesc.c,v 1.25 2010/03/31 13:10:10 pooka Exp $");
+__RCSID("$NetBSD: mount_fdesc.c,v 1.26 2011/08/29 14:35:00 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -100,7 +100,7 @@
 	MOPT_NULL,
 };
 
-static void	usage(void);
+__dead static void	usage(void);
 int	mount_fdesc(int argc, char **argv);
 
 #ifndef MOUNT_NOMAIN

Index: src/sbin/mount_ffs/mount_ffs.c
diff -u src/sbin/mount_ffs/mount_ffs.c:1.26 src/sbin/mount_ffs/mount_ffs.c:1.27
--- src/sbin/mount_ffs/mount_ffs.c:1.26	Fri Jun 17 14:23:51 2011
+++ src/sbin/mount_ffs/mount_ffs.c	Mon Aug 29 14:35:01 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_ffs.c,v 1.26 2011/06/17 14:23:51 manu Exp $	*/
+/*	$NetBSD: mount_ffs.c,v 1.27 2011/08/29 14:35:01 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_ufs.c	8.4 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_ffs.c,v 1.26 2011/06/17 14:23:51 manu Exp $");
+__RCSID("$NetBSD: mount_ffs.c,v 1.27 2011/08/29 14:35:01 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -60,7 +60,7 @@
 #include "mountprog.h"
 #include "mount_ffs.h"
 
-static void	ffs_usage(void);
+__dead static void	ffs_usage(void);
 
 static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,

Index: src/sbin/mount_filecore/mount_filecore.c
diff -u src/sbin/mount_filecore/mount_filecore.c:1.19 src/sbin/mount_filecore/mount_filecore.c:1.20
--- src/sbin/mount_filecore/mount_filecore.c:1.19	Tue Aug  5 20:57:45 2008
+++ src/sbin/mount_filecore/mount_filecore.c	Mon Aug 29 14:35:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_filecore.c,v 1.19 2008/08/05 20:57:45 pooka Exp $ */
+/* $NetBSD: mount_filecore.c,v 1.20 2011/08/29 14:35:01 joerg Exp $ */
 
 /*
  * Copyright (c) 1992, 1993, 1994 The Regents of the University of California.
@@ -104,7 +104,7 @@
 };
 
 int	mount_filecore(int argc, char **argv);
-static void	usage(void);
+__dead static void	usage(void);
 
 #ifndef MOUNT_NOMAIN
 int

Index: src/sbin/mount_hfs/mount_hfs.c
diff -u src/sbin/mount_hfs/mount_hfs.c:1.8 src/sbin/mount_hfs/mount_hfs.c:1.9
--- src/sbin/mount_hfs/mount_hfs.c:1.8	Tue Aug  5 20:57:45 2008
+++ src/sbin/mount_hfs/mount_hfs.c	Mon Aug 29 14:35:01 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_hfs.c,v 1.8 2008/08/05 20:57:45 pooka Exp $	*/
+/*	$NetBSD: mount_hfs.c,v 1.9 2011/08/29 14:35:01 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
 #endif /* not lint */
 
 #ifndef lint
-__RCSID("$NetBSD: mount_hfs.c,v 1.8 2008/08/05 20:57:45 pooka Exp $");
+__RCSID("$NetBSD: mount_hfs.c,v 1.9 2011/08/29 14:35:01 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -89,7 +89,7 @@
 };
 
 int	main(int, char *[]);
-static void	usage(void);
+__dead static void	usage(void);
 
 #ifndef MOUNT_NOMAIN
 int

Index: src/sbin/mount_kernfs/mount_kernfs.c
diff -u src/sbin/mount_kernfs/mount_kernfs.c:1.24 src/sbin/mount_kernfs/mount_kernfs.c:1.25
--- src/sbin/mount_kernfs/mount_kernfs.c:1.24	Wed Mar 31 13:33:14 2010
+++ src/sbin/mount_kernfs/mount_kernfs.c	Mon Aug 29 14:35:01 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_kernfs.c,v 1.24 2010/03/31 13:33:14 pooka Exp $	*/
+/*	$NetBSD: mount_kernfs.c,v 1.25 2011/08/29 14:35:01 joerg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -77,7 +77,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_kernfs.c	8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: mount_kernfs.c,v 1.24 2010/03/31 13:33:14 pooka Exp $");
+__RCSID("$NetBSD: mount_kernfs.c,v 1.25 2011/08/29 14:35:01 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -101,7 +101,7 @@
 };
 
 int	mount_kernfs(int argc, char **argv);
-static void	usage(void);
+__dead static void	usage(void);
 
 #ifndef MOUNT_NOMAIN
 int

Index: src/sbin/mount_lfs/mount_lfs.c
diff -u src/sbin/mount_lfs/mount_lfs.c:1.33 src/sbin/mount_lfs/mount_lfs.c:1.34
--- src/sbin/mount_lfs/mount_lfs.c:1.33	Tue Aug  5 20:57:45 2008
+++ src/sbin/mount_lfs/mount_lfs.c	Mon Aug 29 14:35:01 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_lfs.c,v 1.33 2008/08/05 20:57:45 pooka Exp $	*/
+/*	$NetBSD: mount_lfs.c,v 1.34 2011/08/29 14:35:01 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_lfs.c	8.4 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_lfs.c,v 1.33 2008/08/05 20:57:45 pooka Exp $");
+__RCSID("$NetBSD: mount_lfs.c,v 1.34 2011/08/29 14:35:01 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -71,10 +71,10 @@
 	MOPT_NULL,
 };
 
-static void	usage(void);
+__dead static void	usage(void);
 
 #ifdef WANT_CLEANER
-static void	invoke_cleaner(char *);
+__dead static void	invoke_cleaner(char *);
 static void	kill_daemon(char *);
 static void	kill_cleaner(char *);
 #endif /* WANT_CLEANER */

Index: src/sbin/mount_nfs/mount_nfs.c
diff -u src/sbin/mount_nfs/mount_nfs.c:1.68 src/sbin/mount_nfs/mount_nfs.c:1.69
--- src/sbin/mount_nfs/mount_nfs.c:1.68	Mon Nov 30 17:17:55 2009
+++ src/sbin/mount_nfs/mount_nfs.c	Mon Aug 29 14:35:02 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_nfs.c,v 1.68 2009/11/30 17:17:55 pooka Exp $	*/
+/*	$NetBSD: mount_nfs.c,v 1.69 2011/08/29 14:35:02 joerg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_nfs.c	8.11 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: mount_nfs.c,v 1.68 2009/11/30 17:17:55 pooka Exp $");
+__RCSID("$NetBSD: mount_nfs.c,v 1.69 2011/08/29 14:35:02 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -172,7 +172,7 @@
 #endif
 int	mount_nfs(int argc, char **argv);
 /* void	set_rpc_maxgrouplist(int); */
-static void	usage(void);
+__dead static void	usage(void);
 
 #ifndef MOUNT_NOMAIN
 int

Index: src/sbin/mount_null/mount_null.c
diff -u src/sbin/mount_null/mount_null.c:1.18 src/sbin/mount_null/mount_null.c:1.19
--- src/sbin/mount_null/mount_null.c:1.18	Sun Jul 20 01:20:22 2008
+++ src/sbin/mount_null/mount_null.c	Mon Aug 29 14:35:02 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_null.c,v 1.18 2008/07/20 01:20:22 lukem Exp $	*/
+/*	$NetBSD: mount_null.c,v 1.19 2011/08/29 14:35:02 joerg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_null.c	8.6 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_null.c,v 1.18 2008/07/20 01:20:22 lukem Exp $");
+__RCSID("$NetBSD: mount_null.c,v 1.19 2011/08/29 14:35:02 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -66,7 +66,7 @@
 
 int	mount_null(int argc, char **argv);
 static int	subdir(const char *, const char *);
-static void	usage(void);
+__dead static void	usage(void);
 
 #ifndef MOUNT_NOMAIN
 int

Index: src/sbin/mount_overlay/mount_overlay.c
diff -u src/sbin/mount_overlay/mount_overlay.c:1.12 src/sbin/mount_overlay/mount_overlay.c:1.13
--- src/sbin/mount_overlay/mount_overlay.c:1.12	Sun Jul 20 01:20:22 2008
+++ src/sbin/mount_overlay/mount_overlay.c	Mon Aug 29 14:35:02 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_overlay.c,v 1.12 2008/07/20 01:20:22 lukem Exp $	*/
+/*	$NetBSD: mount_overlay.c,v 1.13 2011/08/29 14:35:02 joerg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_null.c	8.6 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_overlay.c,v 1.12 2008/07/20 01:20:22 lukem Exp $");
+__RCSID("$NetBSD: mount_overlay.c,v 1.13 2011/08/29 14:35:02 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -65,7 +65,7 @@
 };
 
 int	mount_overlay(int argc, char **argv);
-static void	usage(void);
+__dead static void	usage(void);
 
 #ifndef MOUNT_NOMAIN
 int

Index: src/sbin/mount_portal/puffs_portal.c
diff -u src/sbin/mount_portal/puffs_portal.c:1.3 src/sbin/mount_portal/puffs_portal.c:1.4
--- src/sbin/mount_portal/puffs_portal.c:1.3	Sat Dec 19 16:01:25 2009
+++ src/sbin/mount_portal/puffs_portal.c	Mon Aug 29 14:35:02 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_portal.c,v 1.3 2009/12/19 16:01:25 pooka Exp $	*/
+/*	$NetBSD: puffs_portal.c,v 1.4 2011/08/29 14:35:02 joerg Exp $	*/
 
 /*
  * Copyright (c) 2007  Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: puffs_portal.c,v 1.3 2009/12/19 16:01:25 pooka Exp $");
+__RCSID("$NetBSD: puffs_portal.c,v 1.4 2011/08/29 14:35:02 joerg Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
@@ -54,7 +54,7 @@
 	int fd;
 };
 
-static void usage(void);
+__dead static void usage(void);
 
 PUFFSOP_PROTOS(portal);
 

Index: src/sbin/mount_procfs/mount_procfs.c
diff -u src/sbin/mount_procfs/mount_procfs.c:1.23 src/sbin/mount_procfs/mount_procfs.c:1.24
--- src/sbin/mount_procfs/mount_procfs.c:1.23	Mon Feb 23 19:47:58 2009
+++ src/sbin/mount_procfs/mount_procfs.c	Mon Aug 29 14:35:02 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_procfs.c,v 1.23 2009/02/23 19:47:58 pooka Exp $	*/
+/*	$NetBSD: mount_procfs.c,v 1.24 2011/08/29 14:35:02 joerg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -77,7 +77,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_procfs.c	8.4 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_procfs.c,v 1.23 2009/02/23 19:47:58 pooka Exp $");
+__RCSID("$NetBSD: mount_procfs.c,v 1.24 2011/08/29 14:35:02 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -103,7 +103,7 @@
 };
 
 int	mount_procfs(int argc, char **argv);
-static void	usage(void);
+__dead static void	usage(void);
 
 #ifndef MOUNT_NOMAIN
 int

Index: src/sbin/mount_ptyfs/mount_ptyfs.c
diff -u src/sbin/mount_ptyfs/mount_ptyfs.c:1.11 src/sbin/mount_ptyfs/mount_ptyfs.c:1.12
--- src/sbin/mount_ptyfs/mount_ptyfs.c:1.11	Sat May 21 20:05:02 2011
+++ src/sbin/mount_ptyfs/mount_ptyfs.c	Mon Aug 29 14:35:02 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_ptyfs.c,v 1.11 2011/05/21 20:05:02 riastradh Exp $	*/
+/*	$NetBSD: mount_ptyfs.c,v 1.12 2011/08/29 14:35:02 joerg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -77,7 +77,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_ptyfs.c	8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: mount_ptyfs.c,v 1.11 2011/05/21 20:05:02 riastradh Exp $");
+__RCSID("$NetBSD: mount_ptyfs.c,v 1.12 2011/08/29 14:35:02 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -115,7 +115,7 @@
 int	mount_ptyfs(int argc, char **argv);
 
 static gid_t	getgrp(const char *name);
-static void	usage(void);
+__dead static void	usage(void);
 
 #ifndef MOUNT_NOMAIN
 int

Index: src/sbin/mount_puffs/mount_puffs.c
diff -u src/sbin/mount_puffs/mount_puffs.c:1.3 src/sbin/mount_puffs/mount_puffs.c:1.4
--- src/sbin/mount_puffs/mount_puffs.c:1.3	Fri May 21 11:59:38 2010
+++ src/sbin/mount_puffs/mount_puffs.c	Mon Aug 29 14:35:02 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_puffs.c,v 1.3 2010/05/21 11:59:38 pooka Exp $	*/
+/*	$NetBSD: mount_puffs.c,v 1.4 2011/08/29 14:35:02 joerg Exp $	*/
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mount_puffs.c,v 1.3 2010/05/21 11:59:38 pooka Exp $");
+__RCSID("$NetBSD: mount_puffs.c,v 1.4 2011/08/29 14:35:02 joerg Exp $");
 #endif /* !lint */
 
 #include <sys/param.h>
@@ -51,7 +51,7 @@
 	MOPT_NULL,
 };
 
-static void
+__dead static void
 usage(void)
 {
 

Index: src/sbin/mount_sysvbfs/mount_sysvbfs.c
diff -u src/sbin/mount_sysvbfs/mount_sysvbfs.c:1.7 src/sbin/mount_sysvbfs/mount_sysvbfs.c:1.8
--- src/sbin/mount_sysvbfs/mount_sysvbfs.c:1.7	Thu Sep  4 12:07:58 2008
+++ src/sbin/mount_sysvbfs/mount_sysvbfs.c	Mon Aug 29 14:35:02 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_sysvbfs.c,v 1.7 2008/09/04 12:07:58 pooka Exp $	*/
+/*	$NetBSD: mount_sysvbfs.c,v 1.8 2011/08/29 14:35:02 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -36,7 +36,7 @@
 #endif /* not lint */
 
 #ifndef lint
-__RCSID("$NetBSD: mount_sysvbfs.c,v 1.7 2008/09/04 12:07:58 pooka Exp $");
+__RCSID("$NetBSD: mount_sysvbfs.c,v 1.8 2011/08/29 14:35:02 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -62,7 +62,7 @@
 	MOPT_NULL,
 };
 
-static void
+__dead static void
 sysvbfs_usage(void)
 {
 

Index: src/sbin/mount_umap/mount_umap.c
diff -u src/sbin/mount_umap/mount_umap.c:1.22 src/sbin/mount_umap/mount_umap.c:1.23
--- src/sbin/mount_umap/mount_umap.c:1.22	Sun Jul 20 01:20:22 2008
+++ src/sbin/mount_umap/mount_umap.c	Mon Aug 29 14:35:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_umap.c,v 1.22 2008/07/20 01:20:22 lukem Exp $	*/
+/*	$NetBSD: mount_umap.c,v 1.23 2011/08/29 14:35:03 joerg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_umap.c	8.5 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_umap.c,v 1.22 2008/07/20 01:20:22 lukem Exp $");
+__RCSID("$NetBSD: mount_umap.c,v 1.23 2011/08/29 14:35:03 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -84,7 +84,7 @@
 };
 
 int	mount_umap(int argc, char **argv);
-static void	usage(void);
+__dead static void	usage(void);
 
 #ifndef MOUNT_NOMAIN
 int

Index: src/sbin/mount_union/mount_union.c
diff -u src/sbin/mount_union/mount_union.c:1.21 src/sbin/mount_union/mount_union.c:1.22
--- src/sbin/mount_union/mount_union.c:1.21	Sun Jul 20 01:20:23 2008
+++ src/sbin/mount_union/mount_union.c	Mon Aug 29 14:35:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_union.c,v 1.21 2008/07/20 01:20:23 lukem Exp $	*/
+/*	$NetBSD: mount_union.c,v 1.22 2011/08/29 14:35:03 joerg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_union.c	8.6 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_union.c,v 1.21 2008/07/20 01:20:23 lukem Exp $");
+__RCSID("$NetBSD: mount_union.c,v 1.22 2011/08/29 14:35:03 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -68,7 +68,7 @@
 
 int	mount_union(int argc, char **argv);
 static int	subdir(const char *, const char *);
-static void	usage(void);
+__dead static void	usage(void);
 
 #ifndef MOUNT_NOMAIN
 int

Index: src/sbin/newfs_msdos/newfs_msdos.c
diff -u src/sbin/newfs_msdos/newfs_msdos.c:1.35 src/sbin/newfs_msdos/newfs_msdos.c:1.36
--- src/sbin/newfs_msdos/newfs_msdos.c:1.35	Sat Mar  5 13:47:43 2011
+++ src/sbin/newfs_msdos/newfs_msdos.c	Mon Aug 29 14:35:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: newfs_msdos.c,v 1.35 2011/03/05 13:47:43 pooka Exp $	*/
+/*	$NetBSD: newfs_msdos.c,v 1.36 2011/08/29 14:35:03 joerg Exp $	*/
 
 /*
  * Copyright (c) 1998 Robert Nordier
@@ -33,7 +33,7 @@
 static const char rcsid[] =
   "$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.15 2000/10/10 01:49:37 wollman Exp $";
 #else
-__RCSID("$NetBSD: newfs_msdos.c,v 1.35 2011/03/05 13:47:43 pooka Exp $");
+__RCSID("$NetBSD: newfs_msdos.c,v 1.36 2011/08/29 14:35:03 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -237,7 +237,7 @@
 static int oklabel(const char *);
 static void mklabel(u_int8_t *, const char *);
 static void setstr(u_int8_t *, const char *, size_t);
-static void usage(void);
+__dead static void usage(void);
 static void infohandler(int sig);
 
 /*

Index: src/sbin/newfs_sysvbfs/newfs_sysvbfs.c
diff -u src/sbin/newfs_sysvbfs/newfs_sysvbfs.c:1.7 src/sbin/newfs_sysvbfs/newfs_sysvbfs.c:1.8
--- src/sbin/newfs_sysvbfs/newfs_sysvbfs.c:1.7	Sat Apr 11 07:37:50 2009
+++ src/sbin/newfs_sysvbfs/newfs_sysvbfs.c	Mon Aug 29 14:35:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: newfs_sysvbfs.c,v 1.7 2009/04/11 07:37:50 lukem Exp $	*/
+/*	$NetBSD: newfs_sysvbfs.c,v 1.8 2011/08/29 14:35:03 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
 
 #include <fs/sysvbfs/bfs.h>
 
-static void usage(void);
+__dead static void usage(void);
 static int bfs_newfs(int, uint32_t);
 
 int

Index: src/sbin/raidctl/raidctl.c
diff -u src/sbin/raidctl/raidctl.c:1.52 src/sbin/raidctl/raidctl.c:1.53
--- src/sbin/raidctl/raidctl.c:1.52	Sat Feb 19 07:11:10 2011
+++ src/sbin/raidctl/raidctl.c	Mon Aug 29 14:35:03 2011
@@ -1,4 +1,4 @@
-/*      $NetBSD: raidctl.c,v 1.52 2011/02/19 07:11:10 enami Exp $   */
+/*      $NetBSD: raidctl.c,v 1.53 2011/08/29 14:35:03 joerg Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: raidctl.c,v 1.52 2011/02/19 07:11:10 enami Exp $");
+__RCSID("$NetBSD: raidctl.c,v 1.53 2011/08/29 14:35:03 joerg Exp $");
 #endif
 
 
@@ -70,7 +70,7 @@
 static	void rf_output_configuration(int, const char *);
 static  void get_component_number(int, char *, int *, int *);
 static  void rf_fail_disk(int, char *, int);
-static  void usage(void);
+__dead static  void usage(void);
 static  void get_component_label(int, char *);
 static  void set_component_label(int, char *);
 static  void init_component_labels(int, int);

Index: src/sbin/restore/main.c
diff -u src/sbin/restore/main.c:1.33 src/sbin/restore/main.c:1.34
--- src/sbin/restore/main.c:1.33	Sun Jul 20 01:20:23 2008
+++ src/sbin/restore/main.c	Mon Aug 29 14:35:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.33 2008/07/20 01:20:23 lukem Exp $	*/
+/*	$NetBSD: main.c,v 1.34 2011/08/29 14:35:03 joerg Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.33 2008/07/20 01:20:23 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.34 2011/08/29 14:35:03 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -81,7 +81,7 @@
 FILE *Mtreefile = NULL;
 
 static	void obsolete(int *, char **[]);
-static	void usage(void);
+__dead static	void usage(void);
 
 int
 main(int argc, char *argv[])

Index: src/sbin/restore/tape.c
diff -u src/sbin/restore/tape.c:1.65 src/sbin/restore/tape.c:1.66
--- src/sbin/restore/tape.c:1.65	Sat Aug  6 20:46:42 2011
+++ src/sbin/restore/tape.c	Mon Aug 29 14:35:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: tape.c,v 1.65 2011/08/06 20:46:42 dholland Exp $	*/
+/*	$NetBSD: tape.c,v 1.66 2011/08/29 14:35:03 joerg Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)tape.c	8.9 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: tape.c,v 1.65 2011/08/06 20:46:42 dholland Exp $");
+__RCSID("$NetBSD: tape.c,v 1.66 2011/08/29 14:35:03 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -148,7 +148,7 @@
 static void	 terminateinput(void);
 static void	 xtrfile(char *, long);
 static void	 xtrlnkfile(char *, long);
-static void	 xtrlnkskip(char *, long);
+__dead static void	 xtrlnkskip(char *, long);
 static void	 xtrskip(char *, long);
 static void	 swap_header(struct s_spcl *);
 static void	 swap_old_header(struct s_ospcl *);

Index: src/sbin/route/route.c
diff -u src/sbin/route/route.c:1.131 src/sbin/route/route.c:1.132
--- src/sbin/route/route.c:1.131	Fri Jul  1 02:54:51 2011
+++ src/sbin/route/route.c	Mon Aug 29 14:35:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.131 2011/07/01 02:54:51 joerg Exp $	*/
+/*	$NetBSD: route.c,v 1.132 2011/08/29 14:35:03 joerg Exp $	*/
 
 /*
  * Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)route.c	8.6 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: route.c,v 1.131 2011/07/01 02:54:51 joerg Exp $");
+__RCSID("$NetBSD: route.c,v 1.132 2011/08/29 14:35:03 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -114,7 +114,7 @@
 static int prefixlen(const char *, struct sou *);
 #ifndef SMALL
 static void interfaces(void);
-static void monitor(void);
+__dead static void monitor(void);
 static int print_getmsg(struct rt_msghdr *, int, struct sou *);
 static const char *linkstate(struct if_msghdr *);
 static sup readtag(sup, const char *);

Index: src/sbin/routed/defs.h
diff -u src/sbin/routed/defs.h:1.25 src/sbin/routed/defs.h:1.26
--- src/sbin/routed/defs.h:1.25	Mon Oct 26 02:53:15 2009
+++ src/sbin/routed/defs.h	Mon Aug 29 14:35:04 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: defs.h,v 1.25 2009/10/26 02:53:15 christos Exp $	*/
+/*	$NetBSD: defs.h,v 1.26 2011/08/29 14:35:04 joerg Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -552,7 +552,7 @@
 extern void	msglim(struct msg_limit *, naddr,
 		       const char *, ...) PATTRIB(3,4);
 #define	LOGERR(msg) msglog(msg ": %s", strerror(errno))
-extern void	logbad(int, const char *, ...) PATTRIB(2,3);
+__dead extern void	logbad(int, const char *, ...) PATTRIB(2,3);
 #define	BADERR(dump,msg) logbad(dump,msg ": %s", strerror(errno))
 #ifdef DEBUG
 #define	DBGERR(dump,msg) BADERR(dump,msg)

Index: src/sbin/routed/rtquery/rtquery.c
diff -u src/sbin/routed/rtquery/rtquery.c:1.22 src/sbin/routed/rtquery/rtquery.c:1.23
--- src/sbin/routed/rtquery/rtquery.c:1.22	Mon Oct 26 02:53:15 2009
+++ src/sbin/routed/rtquery/rtquery.c	Mon Aug 29 14:35:04 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtquery.c,v 1.22 2009/10/26 02:53:15 christos Exp $	*/
+/*	$NetBSD: rtquery.c,v 1.23 2011/08/29 14:35:04 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1993
@@ -63,7 +63,7 @@
 __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\
  The Regents of the University of California.  All rights reserved.");
 #ifdef __NetBSD__
-__RCSID("$NetBSD: rtquery.c,v 1.22 2009/10/26 02:53:15 christos Exp $");
+__RCSID("$NetBSD: rtquery.c,v 1.23 2011/08/29 14:35:04 joerg Exp $");
 #elif defined(__FreeBSD__)
 __RCSID("$FreeBSD$");
 #else
@@ -132,7 +132,7 @@
 static int getnet(char *, struct netinfo *);
 static u_int std_mask(u_int);
 static int parse_quote(char **, const char *, char *, char *, int);
-static void usage(void);
+__dead static void usage(void);
 
 
 int

Index: src/sbin/scsictl/scsictl.c
diff -u src/sbin/scsictl/scsictl.c:1.32 src/sbin/scsictl/scsictl.c:1.33
--- src/sbin/scsictl/scsictl.c:1.32	Tue May 24 12:04:18 2011
+++ src/sbin/scsictl/scsictl.c	Mon Aug 29 14:35:04 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsictl.c,v 1.32 2011/05/24 12:04:18 joerg Exp $	*/
+/*	$NetBSD: scsictl.c,v 1.33 2011/08/29 14:35:04 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: scsictl.c,v 1.32 2011/05/24 12:04:18 joerg Exp $");
+__RCSID("$NetBSD: scsictl.c,v 1.33 2011/08/29 14:35:04 joerg Exp $");
 #endif
 
 
@@ -66,7 +66,7 @@
 	void (*cmd_func)(int, char *[]);
 };
 
-void	usage(void);
+__dead static void	usage(void);
 
 int	fd;				/* file descriptor for device */
 const	char *dvname;			/* device name */
@@ -188,7 +188,7 @@
 	exit(0);
 }
 
-void
+static void
 usage(void)
 {
 	int i;

Index: src/sbin/sysctl/sysctl.c
diff -u src/sbin/sysctl/sysctl.c:1.137 src/sbin/sysctl/sysctl.c:1.138
--- src/sbin/sysctl/sysctl.c:1.137	Wed Aug 24 12:15:44 2011
+++ src/sbin/sysctl/sysctl.c	Mon Aug 29 14:35:04 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysctl.c,v 1.137 2011/08/24 12:15:44 christos Exp $ */
+/*	$NetBSD: sysctl.c,v 1.138 2011/08/29 14:35:04 joerg Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 #if 0
 static char sccsid[] = "@(#)sysctl.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: sysctl.c,v 1.137 2011/08/24 12:15:44 christos Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.138 2011/08/29 14:35:04 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -138,7 +138,7 @@
 static void display_struct(const struct sysctlnode *, const char *,
 			   const void *, size_t, int);
 static void hex_dump(const unsigned char *, size_t);
-static void usage(void);
+__dead static void usage(void);
 static void parse(char *, regex_t *, size_t *);
 static void parse_create(char *);
 static void parse_destroy(char *);

Index: src/sbin/tunefs/tunefs.c
diff -u src/sbin/tunefs/tunefs.c:1.43 src/sbin/tunefs/tunefs.c:1.44
--- src/sbin/tunefs/tunefs.c:1.43	Sun Mar  6 17:08:17 2011
+++ src/sbin/tunefs/tunefs.c	Mon Aug 29 14:35:04 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: tunefs.c,v 1.43 2011/03/06 17:08:17 bouyer Exp $	*/
+/*	$NetBSD: tunefs.c,v 1.44 2011/08/29 14:35:04 joerg Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)tunefs.c	8.3 (Berkeley) 5/3/95";
 #else
-__RCSID("$NetBSD: tunefs.c,v 1.43 2011/03/06 17:08:17 bouyer Exp $");
+__RCSID("$NetBSD: tunefs.c,v 1.44 2011/08/29 14:35:04 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -95,7 +95,7 @@
 static	void	getsb(struct fs *, const char *);
 static	int	openpartition(const char *, int, char *, size_t);
 static	void	show_log_info(void);
-static	void	usage(void);
+__dead static	void	usage(void);
 
 int
 main(int argc, char *argv[])

Index: src/sbin/veriexecctl/veriexecctl.c
diff -u src/sbin/veriexecctl/veriexecctl.c:1.34 src/sbin/veriexecctl/veriexecctl.c:1.35
--- src/sbin/veriexecctl/veriexecctl.c:1.34	Mon Mar 16 13:38:09 2009
+++ src/sbin/veriexecctl/veriexecctl.c	Mon Aug 29 14:35:04 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: veriexecctl.c,v 1.34 2009/03/16 13:38:09 lukem Exp $	*/
+/*	$NetBSD: veriexecctl.c,v 1.35 2011/08/29 14:35:04 joerg Exp $	*/
 
 /*-
  * Copyright 2005 Elad Efrat <[email protected]>
@@ -64,7 +64,7 @@
 int gfd, verbose = 0, error = EXIT_SUCCESS;
 size_t line = 0;
 
-static void
+__dead static void
 usage(void)
 {
 	const char *progname = getprogname();

Reply via email to