Module Name: src
Committed By: joerg
Date: Mon Aug 29 20:38:55 UTC 2011
Modified Files:
src/usr.sbin/ac: ac.c
src/usr.sbin/accton: accton.c
src/usr.sbin/acpitools/acpidump: acpidump.c
src/usr.sbin/acpitools/amldb: amldb.c
src/usr.sbin/altq/altqd: altqd.c
src/usr.sbin/altq/altqstat: altqstat.c
src/usr.sbin/altq/tbrconfig: tbrconfig.c
src/usr.sbin/bootp/bootpd: bootpd.c
src/usr.sbin/bootp/bootpef: bootpef.c
src/usr.sbin/bootp/bootpgw: bootpgw.c
src/usr.sbin/btpand: btpand.c client.c
src/usr.sbin/catman: catman.c
src/usr.sbin/rtsold: rtsold.c
src/usr.sbin/ypbind: ypbind.c
Log Message:
Use __dead.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/ac/ac.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/accton/accton.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/acpitools/acpidump/acpidump.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/amldb/amldb.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/altq/altqd/altqd.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/altq/altqstat/altqstat.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/altq/tbrconfig/tbrconfig.c
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/bootp/bootpd/bootpd.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/bootp/bootpef/bootpef.c
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/bootp/bootpgw/bootpgw.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/btpand/btpand.c \
src/usr.sbin/btpand/client.c
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/catman/catman.c
cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/rtsold/rtsold.c
cvs rdiff -u -r1.88 -r1.89 src/usr.sbin/ypbind/ypbind.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ac/ac.c
diff -u src/usr.sbin/ac/ac.c:1.23 src/usr.sbin/ac/ac.c:1.24
--- src/usr.sbin/ac/ac.c:1.23 Fri May 26 02:16:17 2006
+++ src/usr.sbin/ac/ac.c Mon Aug 29 20:38:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ac.c,v 1.23 2006/05/26 02:16:17 jnemeth Exp $ */
+/* $NetBSD: ac.c,v 1.24 2011/08/29 20:38:53 joerg Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -49,7 +49,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ac.c,v 1.23 2006/05/26 02:16:17 jnemeth Exp $");
+__RCSID("$NetBSD: ac.c,v 1.24 2011/08/29 20:38:53 joerg Exp $");
#endif
#include <sys/types.h>
@@ -134,7 +134,7 @@
static void show_users(struct user_list *);
static struct user_list *update_user(struct user_list *, char *, time_t);
static int compare(const void *, const void *);
-static void usage(void);
+__dead static void usage(void);
/*
* open wtmp or die
Index: src/usr.sbin/accton/accton.c
diff -u src/usr.sbin/accton/accton.c:1.11 src/usr.sbin/accton/accton.c:1.12
--- src/usr.sbin/accton/accton.c:1.11 Mon Jul 21 13:36:57 2008
+++ src/usr.sbin/accton/accton.c Mon Aug 29 20:38:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: accton.c,v 1.11 2008/07/21 13:36:57 lukem Exp $ */
+/* $NetBSD: accton.c,v 1.12 2011/08/29 20:38:54 joerg Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)accton.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: accton.c,v 1.11 2008/07/21 13:36:57 lukem Exp $");
+__RCSID("$NetBSD: accton.c,v 1.12 2011/08/29 20:38:54 joerg Exp $");
#endif
#endif /* not lint */
@@ -51,7 +51,7 @@
#include <stdio.h>
#include <string.h>
-void usage(void);
+__dead static void usage(void);
int
main(int argc, char **argv)
@@ -82,7 +82,7 @@
exit(0);
}
-void
+static void
usage(void)
{
Index: src/usr.sbin/acpitools/acpidump/acpidump.c
diff -u src/usr.sbin/acpitools/acpidump/acpidump.c:1.4 src/usr.sbin/acpitools/acpidump/acpidump.c:1.5
--- src/usr.sbin/acpitools/acpidump/acpidump.c:1.4 Thu Feb 17 10:18:05 2011
+++ src/usr.sbin/acpitools/acpidump/acpidump.c Mon Aug 29 20:38:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpidump.c,v 1.4 2011/02/17 10:18:05 jmcneill Exp $ */
+/* $NetBSD: acpidump.c,v 1.5 2011/08/29 20:38:54 joerg Exp $ */
/*-
* Copyright (c) 2000 Mitsuru IWASAKI <iwas...@freebsd.org>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: acpidump.c,v 1.4 2011/02/17 10:18:05 jmcneill Exp $");
+__RCSID("$NetBSD: acpidump.c,v 1.5 2011/08/29 20:38:54 joerg Exp $");
#include <sys/param.h>
@@ -48,7 +48,7 @@
int tflag; /* Dump contents of SDT tables */
int vflag; /* Use verbose messages */
-static void
+__dead static void
usage(void)
{
const char *progname = getprogname();
Index: src/usr.sbin/acpitools/amldb/amldb.c
diff -u src/usr.sbin/acpitools/amldb/amldb.c:1.2 src/usr.sbin/acpitools/amldb/amldb.c:1.3
--- src/usr.sbin/acpitools/amldb/amldb.c:1.2 Sun Jan 14 05:33:18 2007
+++ src/usr.sbin/acpitools/amldb/amldb.c Mon Aug 29 20:38:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: amldb.c,v 1.2 2007/01/14 05:33:18 dogcow Exp $ */
+/* $NetBSD: amldb.c,v 1.3 2011/08/29 20:38:54 joerg Exp $ */
/*-
* Copyright (c) 1999 Mitsuru IWASAKI <iwas...@freebsd.org>
@@ -29,7 +29,7 @@
* $FreeBSD: src/usr.sbin/acpi/amldb/amldb.c,v 1.3 2001/10/22 17:25:32 iwasaki Exp $
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: amldb.c,v 1.2 2007/01/14 05:33:18 dogcow Exp $");
+__RCSID("$NetBSD: amldb.c,v 1.3 2011/08/29 20:38:54 joerg Exp $");
#include <sys/param.h>
#include <sys/mman.h>
@@ -145,7 +145,7 @@
return (0);
}
-static void
+__dead static void
usage(const char *progname)
{
Index: src/usr.sbin/altq/altqd/altqd.c
diff -u src/usr.sbin/altq/altqd/altqd.c:1.10 src/usr.sbin/altq/altqd/altqd.c:1.11
--- src/usr.sbin/altq/altqd/altqd.c:1.10 Tue Aug 16 12:39:29 2011
+++ src/usr.sbin/altq/altqd/altqd.c Mon Aug 29 20:38:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: altqd.c,v 1.10 2011/08/16 12:39:29 christos Exp $ */
+/* $NetBSD: altqd.c,v 1.11 2011/08/29 20:38:54 joerg Exp $ */
/* $KAME: altqd.c,v 1.10 2002/02/20 10:42:26 kjc Exp $ */
/*
* Copyright (c) 2001 Theo de Raadt
@@ -79,7 +79,7 @@
static volatile sig_atomic_t gotsig_hup, gotsig_int, gotsig_term;
-static void usage(void);
+__dead static void usage(void);
static void sig_handler(int);
static void
Index: src/usr.sbin/altq/altqstat/altqstat.c
diff -u src/usr.sbin/altq/altqstat/altqstat.c:1.7 src/usr.sbin/altq/altqstat/altqstat.c:1.8
--- src/usr.sbin/altq/altqstat/altqstat.c:1.7 Sat Oct 28 11:43:02 2006
+++ src/usr.sbin/altq/altqstat/altqstat.c Mon Aug 29 20:38:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: altqstat.c,v 1.7 2006/10/28 11:43:02 peter Exp $ */
+/* $NetBSD: altqstat.c,v 1.8 2011/08/29 20:38:54 joerg Exp $ */
/* $KAME: altqstat.c,v 1.8 2002/10/27 03:19:35 kjc Exp $ */
/*
* Copyright (C) 1999-2000
@@ -55,9 +55,9 @@
stat_loop_t *stat_loop;
-static void sig_handler(int);
+__dead static void sig_handler(int);
static void alrm_handler(int);
-static void usage(void);
+__dead static void usage(void);
static void
sig_handler(int sig)
Index: src/usr.sbin/altq/tbrconfig/tbrconfig.c
diff -u src/usr.sbin/altq/tbrconfig/tbrconfig.c:1.3 src/usr.sbin/altq/tbrconfig/tbrconfig.c:1.4
--- src/usr.sbin/altq/tbrconfig/tbrconfig.c:1.3 Thu Aug 16 07:48:15 2001
+++ src/usr.sbin/altq/tbrconfig/tbrconfig.c Mon Aug 29 20:38:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tbrconfig.c,v 1.3 2001/08/16 07:48:15 itojun Exp $ */
+/* $NetBSD: tbrconfig.c,v 1.4 2011/08/29 20:38:54 joerg Exp $ */
/* $KAME: tbrconfig.c,v 1.3 2001/05/08 04:36:39 itojun Exp $ */
/*
* Copyright (C) 2000
@@ -44,7 +44,7 @@
#define ALTQ_DEVICE "/dev/altq/altq"
-static void usage(void);
+__dead static void usage(void);
static u_long atobps(const char *s);
static u_long atobytes(const char *s);
static u_int size_bucket(const char *ifname, const u_int rate);
Index: src/usr.sbin/bootp/bootpd/bootpd.c
diff -u src/usr.sbin/bootp/bootpd/bootpd.c:1.23 src/usr.sbin/bootp/bootpd/bootpd.c:1.24
--- src/usr.sbin/bootp/bootpd/bootpd.c:1.23 Wed Apr 15 00:23:28 2009
+++ src/usr.sbin/bootp/bootpd/bootpd.c Mon Aug 29 20:38:54 2011
@@ -22,7 +22,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: bootpd.c,v 1.23 2009/04/15 00:23:28 lukem Exp $");
+__RCSID("$NetBSD: bootpd.c,v 1.24 2011/08/29 20:38:54 joerg Exp $");
#endif
/*
@@ -114,7 +114,7 @@
PRIVATE void handle_reply(void);
PRIVATE void handle_request(void);
PRIVATE void sendreply(int forward, int32 dest_override);
-PRIVATE void usage(void);
+__dead PRIVATE void usage(void);
int main(int, char **);
/*
Index: src/usr.sbin/bootp/bootpef/bootpef.c
diff -u src/usr.sbin/bootp/bootpef/bootpef.c:1.9 src/usr.sbin/bootp/bootpef/bootpef.c:1.10
--- src/usr.sbin/bootp/bootpef/bootpef.c:1.9 Wed Apr 15 00:23:28 2009
+++ src/usr.sbin/bootp/bootpef/bootpef.c Mon Aug 29 20:38:54 2011
@@ -22,7 +22,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: bootpef.c,v 1.9 2009/04/15 00:23:28 lukem Exp $");
+__RCSID("$NetBSD: bootpef.c,v 1.10 2011/08/29 20:38:54 joerg Exp $");
#endif
@@ -82,7 +82,7 @@
*/
static void mktagfile(struct host *);
-static void usage(void);
+__dead static void usage(void);
int main(int, char **);
Index: src/usr.sbin/bootp/bootpgw/bootpgw.c
diff -u src/usr.sbin/bootp/bootpgw/bootpgw.c:1.14 src/usr.sbin/bootp/bootpgw/bootpgw.c:1.15
--- src/usr.sbin/bootp/bootpgw/bootpgw.c:1.14 Wed Apr 15 00:23:28 2009
+++ src/usr.sbin/bootp/bootpgw/bootpgw.c Mon Aug 29 20:38:55 2011
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: bootpgw.c,v 1.14 2009/04/15 00:23:28 lukem Exp $");
+__RCSID("$NetBSD: bootpgw.c,v 1.15 2011/08/29 20:38:55 joerg Exp $");
#endif
/*
@@ -84,7 +84,7 @@
* Externals, forward declarations, and global variables
*/
-static void usage(void);
+__dead static void usage(void);
static void handle_reply(void);
static void handle_request(void);
int main(int, char **);
Index: src/usr.sbin/btpand/btpand.c
diff -u src/usr.sbin/btpand/btpand.c:1.5 src/usr.sbin/btpand/btpand.c:1.6
--- src/usr.sbin/btpand/btpand.c:1.5 Wed May 13 03:21:41 2009
+++ src/usr.sbin/btpand/btpand.c Mon Aug 29 20:38:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: btpand.c,v 1.5 2009/05/13 03:21:41 christos Exp $ */
+/* $NetBSD: btpand.c,v 1.6 2011/08/29 20:38:55 joerg Exp $ */
/*-
* Copyright (c) 2008-2009 Iain Hibbert
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008-2009 Iain Hibbert. All rights reserved.");
-__RCSID("$NetBSD: btpand.c,v 1.5 2009/05/13 03:21:41 christos Exp $");
+__RCSID("$NetBSD: btpand.c,v 1.6 2011/08/29 20:38:55 joerg Exp $");
#include <sys/wait.h>
@@ -78,9 +78,9 @@
},
};
-static void main_exit(int);
+__dead static void main_exit(int);
static void main_detach(void);
-static void usage(void);
+__dead static void usage(void);
int
main(int argc, char *argv[])
Index: src/usr.sbin/btpand/client.c
diff -u src/usr.sbin/btpand/client.c:1.5 src/usr.sbin/btpand/client.c:1.6
--- src/usr.sbin/btpand/client.c:1.5 Tue Feb 8 21:59:50 2011
+++ src/usr.sbin/btpand/client.c Mon Aug 29 20:38:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: client.c,v 1.5 2011/02/08 21:59:50 plunky Exp $ */
+/* $NetBSD: client.c,v 1.6 2011/08/29 20:38:55 joerg Exp $ */
/*-
* Copyright (c) 2008-2009 Iain Hibbert
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: client.c,v 1.5 2011/02/08 21:59:50 plunky Exp $");
+__RCSID("$NetBSD: client.c,v 1.6 2011/08/29 20:38:55 joerg Exp $");
#include <bluetooth.h>
#include <errno.h>
@@ -36,7 +36,7 @@
#include "btpand.h"
#include "bnep.h"
-static void client_down(channel_t *);
+__dead static void client_down(channel_t *);
static void client_query(void);
void
Index: src/usr.sbin/catman/catman.c
diff -u src/usr.sbin/catman/catman.c:1.29 src/usr.sbin/catman/catman.c:1.30
--- src/usr.sbin/catman/catman.c:1.29 Wed Apr 15 00:40:01 2009
+++ src/usr.sbin/catman/catman.c Mon Aug 29 20:38:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: catman.c,v 1.29 2009/04/15 00:40:01 lukem Exp $ */
+/* $NetBSD: catman.c,v 1.30 2011/08/29 20:38:55 joerg Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -60,7 +60,6 @@
TAG *defp; /* pointer to _default list */
-int main(int, char * const *);
static void setdefentries(char *, char *, const char *);
static void uniquepath(void);
static void catman(void);
@@ -70,7 +69,7 @@
static void makecat(const char *, const char *, const char *, const char *);
static void makewhatis(void);
static void dosystem(const char *);
-static void usage(void);
+__dead static void usage(void);
int
Index: src/usr.sbin/rtsold/rtsold.c
diff -u src/usr.sbin/rtsold/rtsold.c:1.35 src/usr.sbin/rtsold/rtsold.c:1.36
--- src/usr.sbin/rtsold/rtsold.c:1.35 Sat Apr 11 07:51:59 2009
+++ src/usr.sbin/rtsold/rtsold.c Mon Aug 29 20:38:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsold.c,v 1.35 2009/04/11 07:51:59 lukem Exp $ */
+/* $NetBSD: rtsold.c,v 1.36 2011/08/29 20:38:55 joerg Exp $ */
/* $KAME: rtsold.c,v 1.77 2004/01/03 01:35:13 itojun Exp $ */
/*
@@ -114,7 +114,7 @@
#ifndef SMALL
static void rtsold_set_dump_file __P((int));
#endif
-static void usage __P((char *));
+__dead static void usage(char *);
int
main(int argc, char **argv)
Index: src/usr.sbin/ypbind/ypbind.c
diff -u src/usr.sbin/ypbind/ypbind.c:1.88 src/usr.sbin/ypbind/ypbind.c:1.89
--- src/usr.sbin/ypbind/ypbind.c:1.88 Wed May 25 04:59:22 2011
+++ src/usr.sbin/ypbind/ypbind.c Mon Aug 29 20:38:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ypbind.c,v 1.88 2011/05/25 04:59:22 dholland Exp $ */
+/* $NetBSD: ypbind.c,v 1.89 2011/08/29 20:38:55 joerg Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <dera...@fsa.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef LINT
-__RCSID("$NetBSD: ypbind.c,v 1.88 2011/05/25 04:59:22 dholland Exp $");
+__RCSID("$NetBSD: ypbind.c,v 1.89 2011/08/29 20:38:55 joerg Exp $");
#endif
#include <sys/types.h>
@@ -1152,7 +1152,7 @@
////////////////////////////////////////////////////////////
// main
-static void
+__dead static void
usage(void)
{
const char *opt = "";
