summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2011-08-29 14:34:58 +0000
committerjoerg <joerg@NetBSD.org>2011-08-29 14:34:58 +0000
commitf051b9adf574f5f820ad36b4cc1f9eeaceefb5ed (patch)
treed26f2152977fe259cd338db9e91dd660ae907247
parent67ee1825b7283e43a7e8d136f663797646a0b891 (diff)
Use __dead
-rw-r--r--sbin/bioctl/bioctl.c6
-rw-r--r--sbin/cgdconfig/cgdconfig.c6
-rw-r--r--sbin/chown/chown.c6
-rw-r--r--sbin/disklabel/main.c6
-rw-r--r--sbin/dmesg/dmesg.c10
-rw-r--r--sbin/drvctl/drvctl.c4
-rw-r--r--sbin/dump/dumprmt.c6
-rw-r--r--sbin/fsck_ffs/main.c6
-rw-r--r--sbin/fsdb/fsdb.c6
-rw-r--r--sbin/ifconfig/ifconfig.c6
-rw-r--r--sbin/ifconfig/media.c4
-rw-r--r--sbin/mount/mount.c6
-rw-r--r--sbin/mount_ados/mount_ados.c6
-rw-r--r--sbin/mount_cd9660/mount_cd9660.c6
-rw-r--r--sbin/mount_efs/mount_efs.c6
-rw-r--r--sbin/mount_ext2fs/mount_ext2fs.c6
-rw-r--r--sbin/mount_fdesc/mount_fdesc.c6
-rw-r--r--sbin/mount_ffs/mount_ffs.c6
-rw-r--r--sbin/mount_filecore/mount_filecore.c4
-rw-r--r--sbin/mount_hfs/mount_hfs.c6
-rw-r--r--sbin/mount_kernfs/mount_kernfs.c6
-rw-r--r--sbin/mount_lfs/mount_lfs.c8
-rw-r--r--sbin/mount_nfs/mount_nfs.c6
-rw-r--r--sbin/mount_null/mount_null.c6
-rw-r--r--sbin/mount_overlay/mount_overlay.c6
-rw-r--r--sbin/mount_portal/puffs_portal.c6
-rw-r--r--sbin/mount_procfs/mount_procfs.c6
-rw-r--r--sbin/mount_ptyfs/mount_ptyfs.c6
-rw-r--r--sbin/mount_puffs/mount_puffs.c6
-rw-r--r--sbin/mount_sysvbfs/mount_sysvbfs.c6
-rw-r--r--sbin/mount_umap/mount_umap.c6
-rw-r--r--sbin/mount_union/mount_union.c6
-rw-r--r--sbin/newfs_msdos/newfs_msdos.c6
-rw-r--r--sbin/newfs_sysvbfs/newfs_sysvbfs.c4
-rw-r--r--sbin/raidctl/raidctl.c6
-rw-r--r--sbin/restore/main.c6
-rw-r--r--sbin/restore/tape.c6
-rw-r--r--sbin/route/route.c6
-rw-r--r--sbin/routed/defs.h4
-rw-r--r--sbin/routed/rtquery/rtquery.c6
-rw-r--r--sbin/scsictl/scsictl.c8
-rw-r--r--sbin/sysctl/sysctl.c6
-rw-r--r--sbin/tunefs/tunefs.c6
-rw-r--r--sbin/veriexecctl/veriexecctl.c4
44 files changed, 130 insertions, 130 deletions
diff --git a/sbin/bioctl/bioctl.c b/sbin/bioctl/bioctl.c
index 7e5e8b93f02..044b7a9ef30 100644
--- a/sbin/bioctl/bioctl.c
+++ b/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 *);
diff --git a/sbin/cgdconfig/cgdconfig.c b/sbin/cgdconfig/cgdconfig.c
index fdda640573d..5dc125af3f1 100644
--- a/sbin/cgdconfig/cgdconfig.c
+++ b/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;
diff --git a/sbin/chown/chown.c b/sbin/chown/chown.c
index 2de98b4e7db..85bbf60013a 100644
--- a/sbin/chown/chown.c
+++ b/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;
diff --git a/sbin/disklabel/main.c b/sbin/disklabel/main.c
index c98ed78e973..54685072ca5 100644
--- a/sbin/disklabel/main.c
+++ b/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);
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index bf01c6deccc..94c57cac550 100644
--- a/sbin/dmesg/dmesg.c
+++ b/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)
{
diff --git a/sbin/drvctl/drvctl.c b/sbin/drvctl/drvctl.c
index ea07ba95648..33ff0b23fb5 100644
--- a/sbin/drvctl/drvctl.c
+++ b/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);
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index 73954e7cfd6..a494d69e776 100644
--- a/sbin/dump/dumprmt.c
+++ b/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);
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 7479695b52b..3b39caf3872 100644
--- a/sbin/fsck_ffs/main.c
+++ b/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[])
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 720f275b4b5..f03e382e8a9 100644
--- a/sbin/fsdb/fsdb.c
+++ b/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 *);
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index b0fb37efade..af18bdb0574 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/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)
diff --git a/sbin/ifconfig/media.c b/sbin/ifconfig/media.c
index 857113b84e2..b945cb3489a 100644
--- a/sbin/ifconfig/media.c
+++ b/sbin/ifconfig/media.c
@@ -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 @@ static const struct kwinst mediakw[] = {
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",
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index e45359ba708..63e47365a99 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1989, 1993, 1994\
#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 void mangle(char *, int *, const char ** volatile *, int *);
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. */
diff --git a/sbin/mount_ados/mount_ados.c b/sbin/mount_ados/mount_ados.c
index ea43817b5ed..bc15f3e8391 100644
--- a/sbin/mount_ados/mount_ados.c
+++ b/sbin/mount_ados/mount_ados.c
@@ -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 @@ static const struct mntopt mopts[] = {
};
int mount_ados(int argc, char **argv);
-static void usage(void);
+__dead static void usage(void);
#ifndef MOUNT_NOMAIN
int
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 89eff9f50ec..485b8c488a4 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
#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 @@ static const struct mntopt mopts[] = {
MOPT_NULL,
};
-static void usage(void);
+__dead static void usage(void);
#ifndef MOUNT_NOMAIN
int
diff --git a/sbin/mount_efs/mount_efs.c b/sbin/mount_efs/mount_efs.c
index aacb03aae91..913f41f0cc9 100644
--- a/sbin/mount_efs/mount_efs.c
+++ b/sbin/mount_efs/mount_efs.c
@@ -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 <rumble@ephemeral.org>
@@ -41,10 +41,10 @@ static const struct mntopt mopts[] = {
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());
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index 6a6126541ac..3c2b66e6f41 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1993, 1994\
#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 @@ __RCSID("$NetBSD: mount_ext2fs.c,v 1.21 2008/08/05 20:57:45 pooka Exp $");
#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,
diff --git a/sbin/mount_fdesc/mount_fdesc.c b/sbin/mount_fdesc/mount_fdesc.c
index cb9829e87d9..1249c8401c8 100644
--- a/sbin/mount_fdesc/mount_fdesc.c
+++ b/sbin/mount_fdesc/mount_fdesc.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
#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 @@ static const struct mntopt mopts[] = {
MOPT_NULL,
};
-static void usage(void);
+__dead static void usage(void);
int mount_fdesc(int argc, char **argv);
#ifndef MOUNT_NOMAIN
diff --git a/sbin/mount_ffs/mount_ffs.c b/sbin/mount_ffs/mount_ffs.c
index da2b6afe979..5f08f48b6e9 100644
--- a/sbin/mount_ffs/mount_ffs.c
+++ b/sbin/mount_ffs/mount_ffs.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1993, 1994\
#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 @@ __RCSID("$NetBSD: mount_ffs.c,v 1.26 2011/06/17 14:23:51 manu Exp $");
#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,
diff --git a/sbin/mount_filecore/mount_filecore.c b/sbin/mount_filecore/mount_filecore.c
index be39c792c3a..0fcd0cf8498 100644
--- a/sbin/mount_filecore/mount_filecore.c
+++ b/sbin/mount_filecore/mount_filecore.c
@@ -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 @@ static const struct mntopt mopts[] = {
};
int mount_filecore(int argc, char **argv);
-static void usage(void);
+__dead static void usage(void);
#ifndef MOUNT_NOMAIN
int
diff --git a/sbin/mount_hfs/mount_hfs.c b/sbin/mount_hfs/mount_hfs.c
index e0dc0d77901..8546bafce11 100644
--- a/sbin/mount_hfs/mount_hfs.c
+++ b/sbin/mount_hfs/mount_hfs.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 2005 Yevgeny Binder. All rights reserved.");
#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 @@ static const struct mntopt mopts[] = {
};
int main(int, char *[]);
-static void usage(void);
+__dead static void usage(void);
#ifndef MOUNT_NOMAIN
int
diff --git a/sbin/mount_kernfs/mount_kernfs.c b/sbin/mount_kernfs/mount_kernfs.c
index b61e2e7e2a5..af66098686f 100644
--- a/sbin/mount_kernfs/mount_kernfs.c
+++ b/sbin/mount_kernfs/mount_kernfs.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
#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 @@ static const struct mntopt mopts[] = {
};
int mount_kernfs(int argc, char **argv);
-static void usage(void);
+__dead static void usage(void);
#ifndef MOUNT_NOMAIN
int
diff --git a/sbin/mount_lfs/mount_lfs.c b/sbin/mount_lfs/mount_lfs.c
index 69426bdd9b5..66bc71de00f 100644
--- a/sbin/mount_lfs/mount_lfs.c
+++ b/sbin/mount_lfs/mount_lfs.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1993, 1994\
#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 @@ static const struct mntopt mopts[] = {
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 */
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 173eccdac56..34d3ebe7915 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
#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 @@ static struct iso_addr *iso_addr(const char *);
#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
diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c
index 334a6d91ebb..c5ee179ba16 100644
--- a/sbin/mount_null/mount_null.c
+++ b/sbin/mount_null/mount_null.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
#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 @@ static const struct mntopt mopts[] = {
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
diff --git a/sbin/mount_overlay/mount_overlay.c b/sbin/mount_overlay/mount_overlay.c
index dc594ab8370..a32f915e8d6 100644
--- a/sbin/mount_overlay/mount_overlay.c
+++ b/sbin/mount_overlay/mount_overlay.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
#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 @@ static const struct mntopt mopts[] = {
};
int mount_overlay(int argc, char **argv);
-static void usage(void);
+__dead static void usage(void);
#ifndef MOUNT_NOMAIN
int
diff --git a/sbin/mount_portal/puffs_portal.c b/sbin/mount_portal/puffs_portal.c
index 2b717dacba2..adf917ed632 100644
--- a/sbin/mount_portal/puffs_portal.c
+++ b/sbin/mount_portal/puffs_portal.c
@@ -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 @@ struct portal_node {
int fd;
};
-static void usage(void);
+__dead static void usage(void);
PUFFSOP_PROTOS(portal);
diff --git a/sbin/mount_procfs/mount_procfs.c b/sbin/mount_procfs/mount_procfs.c
index a071773332a..5e8f56e1f8d 100644
--- a/sbin/mount_procfs/mount_procfs.c
+++ b/sbin/mount_procfs/mount_procfs.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
#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 @@ static const struct mntopt mopts[] = {
};
int mount_procfs(int argc, char **argv);
-static void usage(void);
+__dead static void usage(void);
#ifndef MOUNT_NOMAIN
int
diff --git a/sbin/mount_ptyfs/mount_ptyfs.c b/sbin/mount_ptyfs/mount_ptyfs.c
index 24a2f7414c9..0526b285975 100644
--- a/sbin/mount_ptyfs/mount_ptyfs.c
+++ b/sbin/mount_ptyfs/mount_ptyfs.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
#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 main(int, char *[]);
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
diff --git a/sbin/mount_puffs/mount_puffs.c b/sbin/mount_puffs/mount_puffs.c
index 534649213e1..cb69aa0f44b 100644
--- a/sbin/mount_puffs/mount_puffs.c
+++ b/sbin/mount_puffs/mount_puffs.c
@@ -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 @@ const struct mntopt getargmopt[] = {
MOPT_NULL,
};
-static void
+__dead static void
usage(void)
{
diff --git a/sbin/mount_sysvbfs/mount_sysvbfs.c b/sbin/mount_sysvbfs/mount_sysvbfs.c
index 9e51610cd1f..307acf878ca 100644
--- a/sbin/mount_sysvbfs/mount_sysvbfs.c
+++ b/sbin/mount_sysvbfs/mount_sysvbfs.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1993, 1994\
#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 @@ static const struct mntopt mopts[] = {
MOPT_NULL,
};
-static void
+__dead static void
sysvbfs_usage(void)
{
diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c
index c73199641b0..766d416c2dc 100644
--- a/sbin/mount_umap/mount_umap.c
+++ b/sbin/mount_umap/mount_umap.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
#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 @@ static const struct mntopt mopts[] = {
};
int mount_umap(int argc, char **argv);
-static void usage(void);
+__dead static void usage(void);
#ifndef MOUNT_NOMAIN
int
diff --git a/sbin/mount_union/mount_union.c b/sbin/mount_union/mount_union.c
index ecf8a46e87e..3e02c4eac71 100644
--- a/sbin/mount_union/mount_union.c
+++ b/sbin/mount_union/mount_union.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
#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 @@ static const struct mntopt mopts[] = {
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
diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c
index 35b6e85b8ef..a0e41276ad0 100644
--- a/sbin/newfs_msdos/newfs_msdos.c
+++ b/sbin/newfs_msdos/newfs_msdos.c
@@ -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 off_t argtooff(const char *, const char *);
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);
/*
diff --git a/sbin/newfs_sysvbfs/newfs_sysvbfs.c b/sbin/newfs_sysvbfs/newfs_sysvbfs.c
index a9ab006f645..4bf2e1b1ee0 100644
--- a/sbin/newfs_sysvbfs/newfs_sysvbfs.c
+++ b/sbin/newfs_sysvbfs/newfs_sysvbfs.c
@@ -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
diff --git a/sbin/raidctl/raidctl.c b/sbin/raidctl/raidctl.c
index 49d1c2fa3f8..ff0fb0298ae 100644
--- a/sbin/raidctl/raidctl.c
+++ b/sbin/raidctl/raidctl.c
@@ -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_get_device_status(int);
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);
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index b79c99a4284..3cdc969251f 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\
#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 @@ int dotflag = 0;
FILE *Mtreefile = NULL;
static void obsolete(int *, char **[]);
-static void usage(void);
+__dead static void usage(void);
int
main(int argc, char *argv[])
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 39e756c0ccd..8f9b8dd3895 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -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 setdumpnum(void);
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 *);
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 70b014d0d1f..5a424462ba6 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1991, 1993\
#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 flushroutes(int, char *const [], int);
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 *);
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index a4db7338a54..124d6486487 100644
--- a/sbin/routed/defs.h
+++ b/sbin/routed/defs.h
@@ -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 @@ struct msg_limit {
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)
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index 86f188f2e00..d3a6a9cbc9a 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.c
@@ -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 void query_loop(char *argv[], int) __dead;
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
diff --git a/sbin/scsictl/scsictl.c b/sbin/scsictl/scsictl.c
index e67d3a21440..8768a409137 100644
--- a/sbin/scsictl/scsictl.c
+++ b/sbin/scsictl/scsictl.c
@@ -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 @@ struct command {
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 @@ main(int argc, char *argv[])
exit(0);
}
-void
+static void
usage(void)
{
int i;
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 01e3ce7d9fc..3455de9ceb9 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1993\
#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_string(const struct sysctlnode *, const char *,
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 *);
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index 9a686af1a1f..fdbe79928ae 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\
#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 change_log_info(long long);
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[])
diff --git a/sbin/veriexecctl/veriexecctl.c b/sbin/veriexecctl/veriexecctl.c
index d60316aa83f..cdbdb3f3e52 100644
--- a/sbin/veriexecctl/veriexecctl.c
+++ b/sbin/veriexecctl/veriexecctl.c
@@ -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 <elad@NetBSD.org>
@@ -64,7 +64,7 @@ extern int yyparse(void);
int gfd, verbose = 0, error = EXIT_SUCCESS;
size_t line = 0;
-static void
+__dead static void
usage(void)
{
const char *progname = getprogname();