Use __dead

Author: jsonn

sbin/bioctl/bioctl.c

@@ -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 @@ struct locator {
 	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 *);

sbin/cgdconfig/cgdconfig.c

@@ -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_disklabel(int);
 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;

sbin/chown/chown.c

@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994, 2003\
 #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 @@ __RCSID("$NetBSD: chown.c,v 1.4 2011/01/13 22:28:36 haad Exp $");
 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;

sbin/disklabel/main.c

@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\
 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 int		 editit(const char *);
 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);

sbin/dmesg/dmesg.c

@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\
 #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 @@ __RCSID("$NetBSD: dmesg.c,v 1.26 2008/07/20 01:20:22 lukem Exp $");
 #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 @@ main(int argc, char *argv[])
 }
 
 #ifndef SMALL
-void
+static void
 usage(void)
 {
 

sbin/drvctl/drvctl.c

@@ -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);
 

sbin/dump/dumprmt.c

@@ -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	char *rmtpeer;
 
 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);

sbin/fsck_ffs/main.c

@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1986, 1993\
 #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 @@ volatile sig_atomic_t	returntosingle = 0;
 
 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[])

sbin/fsdb/fsdb.c

@@ -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 @@ __RCSID("$NetBSD: fsdb.c,v 1.42 2011/08/14 12:30:04 christos Exp $");
 #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 *);

sbin/ifconfig/ifconfig.c

@@ -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 setlinkstr(prop_dictionary_t, prop_dictionary_t);
 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)