Module Name: src
Committed By: joerg
Date: Fri Sep 16 15:39:31 UTC 2011
Modified Files:
src/usr.bin/dirname: dirname.c
src/usr.bin/extattr: getextattr.c
src/usr.bin/find: main.c
src/usr.bin/fsplit: fsplit.c
src/usr.bin/ftp: cmds.c extern.h fetch.c ftp.c main.c
src/usr.bin/grep: grep.c
src/usr.bin/iconv: iconv.c
src/usr.bin/id: id.c
src/usr.bin/ktrace: ktrace.c
src/usr.bin/last: last.c want.c
src/usr.bin/leave: leave.c
src/usr.bin/mail: cmd1.c collect.c lex.c tty.c
src/usr.bin/mkcsmapper: yacc.y
src/usr.bin/mkesdb: yacc.y
src/usr.bin/netstat: if.c main.c
src/usr.bin/newgrp: newgrp.c
src/usr.bin/passwd: extern.h yp_passwd.c
src/usr.bin/pathchk: pathchk.c
src/usr.bin/progress: progress.c
src/usr.bin/pwhash: pwhash.c
src/usr.bin/rev: rev.c
src/usr.bin/rpcinfo: rpcinfo.c
src/usr.bin/rump_allserver: rump_allserver.c
src/usr.bin/rump_dhcpclient: main.c
src/usr.bin/rump_halt: rump.halt.c
src/usr.bin/sdpquery: sdpquery.c
src/usr.bin/shmif_dumpbus: shmif_dumpbus.c
src/usr.bin/shuffle: shuffle.c
src/usr.bin/skey: skey.c
src/usr.bin/sort: sort.c sort.h
src/usr.bin/split: split.c
src/usr.bin/tabs: tabs.c
src/usr.bin/tftp: main.c tftp.c
src/usr.bin/unifdef: unifdef.c
src/usr.bin/usbhidctl: usbhid.c
src/usr.bin/uuencode: uuencode.c
src/usr.bin/uuidgen: uuidgen.c
src/usr.bin/videoctl: videoctl.c
src/usr.bin/w: w.c
src/usr.bin/wc: wc.c
src/usr.bin/xstr: xstr.c
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/dirname/dirname.c
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/extattr/getextattr.c
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/find/main.c
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/fsplit/fsplit.c
cvs rdiff -u -r1.131 -r1.132 src/usr.bin/ftp/cmds.c
cvs rdiff -u -r1.78 -r1.79 src/usr.bin/ftp/extern.h
cvs rdiff -u -r1.193 -r1.194 src/usr.bin/ftp/fetch.c
cvs rdiff -u -r1.161 -r1.162 src/usr.bin/ftp/ftp.c
cvs rdiff -u -r1.118 -r1.119 src/usr.bin/ftp/main.c
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/grep/grep.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/iconv/iconv.c
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/id/id.c
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/ktrace/ktrace.c
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/last/last.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/last/want.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/leave/leave.c
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/mail/cmd1.c
cvs rdiff -u -r1.43 -r1.44 src/usr.bin/mail/collect.c
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/mail/lex.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/mail/tty.c
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/mkcsmapper/yacc.y
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/mkesdb/yacc.y
cvs rdiff -u -r1.71 -r1.72 src/usr.bin/netstat/if.c
cvs rdiff -u -r1.80 -r1.81 src/usr.bin/netstat/main.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/newgrp/newgrp.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/passwd/extern.h
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/passwd/yp_passwd.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/pathchk/pathchk.c
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/progress/progress.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/pwhash/pwhash.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/rev/rev.c
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/rpcinfo/rpcinfo.c
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/rump_allserver/rump_allserver.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/rump_dhcpclient/main.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/rump_halt/rump.halt.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/sdpquery/sdpquery.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/shmif_dumpbus/shmif_dumpbus.c
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/shuffle/shuffle.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/skey/skey.c
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/sort/sort.c
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/sort/sort.h
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/split/split.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/tabs/tabs.c
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/tftp/main.c
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/tftp/tftp.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/unifdef/unifdef.c
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/usbhidctl/usbhid.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/uuencode/uuencode.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/uuidgen/uuidgen.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/videoctl/videoctl.c
cvs rdiff -u -r1.74 -r1.75 src/usr.bin/w/w.c
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/wc/wc.c
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/xstr/xstr.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.bin/dirname/dirname.c
diff -u src/usr.bin/dirname/dirname.c:1.11 src/usr.bin/dirname/dirname.c:1.12
--- src/usr.bin/dirname/dirname.c:1.11 Mon Jul 21 14:19:22 2008
+++ src/usr.bin/dirname/dirname.c Fri Sep 16 15:39:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dirname.c,v 1.11 2008/07/21 14:19:22 lukem Exp $ */
+/* $NetBSD: dirname.c,v 1.12 2011/09/16 15:39:25 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)dirname.c 8.4 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: dirname.c,v 1.11 2008/07/21 14:19:22 lukem Exp $");
+__RCSID("$NetBSD: dirname.c,v 1.12 2011/09/16 15:39:25 joerg Exp $");
#endif /* not lint */
#include <err.h>
@@ -49,7 +49,7 @@
#include <stdlib.h>
#include <unistd.h>
-static void usage(void);
+__dead static void usage(void);
int
main(int argc, char **argv)
Index: src/usr.bin/extattr/getextattr.c
diff -u src/usr.bin/extattr/getextattr.c:1.8 src/usr.bin/extattr/getextattr.c:1.9
--- src/usr.bin/extattr/getextattr.c:1.8 Thu Jul 14 15:25:27 2011
+++ src/usr.bin/extattr/getextattr.c Fri Sep 16 15:39:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: getextattr.c,v 1.8 2011/07/14 15:25:27 manu Exp $ */
+/* $NetBSD: getextattr.c,v 1.9 2011/09/16 15:39:25 joerg Exp $ */
/*-
* Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
@@ -56,7 +56,7 @@
static enum { EADUNNO, EAGET, EASET, EARM, EALS } what = EADUNNO;
-static void
+__dead static void
usage(void)
{
Index: src/usr.bin/find/main.c
diff -u src/usr.bin/find/main.c:1.29 src/usr.bin/find/main.c:1.30
--- src/usr.bin/find/main.c:1.29 Tue Dec 28 15:28:31 2010
+++ src/usr.bin/find/main.c Fri Sep 16 15:39:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.29 2010/12/28 15:28:31 christos Exp $ */
+/* $NetBSD: main.c,v 1.30 2011/09/16 15:39:25 joerg Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -39,7 +39,7 @@
#else
__COPYRIGHT("@(#) Copyright (c) 1990, 1993, 1994\
The Regents of the University of California. All rights reserved.");
-__RCSID("$NetBSD: main.c,v 1.29 2010/12/28 15:28:31 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.30 2011/09/16 15:39:25 joerg Exp $");
#endif
#endif /* not lint */
@@ -69,8 +69,7 @@
int isxargs; /* don't permit xargs delimiting chars */
int regcomp_flags = REG_BASIC; /* regex compilation flags */
-int main(int, char **);
-static void usage(void);
+__dead static void usage(void);
int
main(int argc, char *argv[])
Index: src/usr.bin/fsplit/fsplit.c
diff -u src/usr.bin/fsplit/fsplit.c:1.27 src/usr.bin/fsplit/fsplit.c:1.28
--- src/usr.bin/fsplit/fsplit.c:1.27 Mon Jul 13 19:05:40 2009
+++ src/usr.bin/fsplit/fsplit.c Fri Sep 16 15:39:26 2011
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = "from: @(#)fsplit.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: fsplit.c,v 1.27 2009/07/13 19:05:40 roy Exp $");
+__RCSID("$NetBSD: fsplit.c,v 1.28 2011/09/16 15:39:26 joerg Exp $");
#endif
#endif /* not lint */
@@ -89,7 +89,7 @@
static char mainp[] = "main000.f";
static char blkp[] = "blkdta000.f";
-static void badparms(void);
+__dead static void badparms(void);
static const char *functs(const char *);
static int get_line(void);
static void get_name(char *, int);
Index: src/usr.bin/ftp/cmds.c
diff -u src/usr.bin/ftp/cmds.c:1.131 src/usr.bin/ftp/cmds.c:1.132
--- src/usr.bin/ftp/cmds.c:1.131 Tue Jan 12 06:50:04 2010
+++ src/usr.bin/ftp/cmds.c Fri Sep 16 15:39:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cmds.c,v 1.131 2010/01/12 06:50:04 lukem Exp $ */
+/* $NetBSD: cmds.c,v 1.132 2011/09/16 15:39:26 joerg Exp $ */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: cmds.c,v 1.131 2010/01/12 06:50:04 lukem Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.132 2011/09/16 15:39:26 joerg Exp $");
#endif
#endif /* not lint */
@@ -142,7 +142,7 @@
static sigjmp_buf jabort;
static int confirm(const char *, const char *);
-static void mintr(int);
+__dead static void mintr(int);
static void mabort(const char *);
static void set_type(const char *);
Index: src/usr.bin/ftp/extern.h
diff -u src/usr.bin/ftp/extern.h:1.78 src/usr.bin/ftp/extern.h:1.79
--- src/usr.bin/ftp/extern.h:1.78 Thu Mar 4 21:40:53 2010
+++ src/usr.bin/ftp/extern.h Fri Sep 16 15:39:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.78 2010/03/04 21:40:53 lukem Exp $ */
+/* $NetBSD: extern.h,v 1.79 2011/09/16 15:39:26 joerg Exp $ */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -94,9 +94,6 @@
struct addrinfo;
void abort_remote(FILE *);
-void abort_squared(int);
-void abortpt(int);
-void abortxfer(int);
void account(int, char **);
void ai_unmapped(struct addrinfo *);
int another(int *, char ***, const char *);
@@ -145,7 +142,7 @@
char *hookup(const char *, const char *);
void idlecmd(int, char **);
int initconn(void);
-void intr(int);
+__dead void intr(int);
int isipv6addr(const char *);
void list_vertical(StringList *);
void lcd(int, char **);
@@ -169,7 +166,7 @@
const char *parse_rfc2616time(struct tm *, const char *);
int parserate(int, char **, int);
char *prompt(void);
-void proxabort(int);
+__dead void proxabort(int);
void proxtrans(const char *, const char *, const char *);
void psabort(int);
void pswitch(int);
@@ -241,7 +238,6 @@
void unsetoption(int, char **);
void updatelocalcwd(void);
void updateremotecwd(void);
-void usage(void);
void user(int, char **);
int ftp_connect(int, const struct sockaddr *, socklen_t);
int ftp_listen(int, int);
Index: src/usr.bin/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.193 src/usr.bin/ftp/fetch.c:1.194
--- src/usr.bin/ftp/fetch.c:1.193 Fri Mar 5 07:41:10 2010
+++ src/usr.bin/ftp/fetch.c Fri Sep 16 15:39:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.193 2010/03/05 07:41:10 lukem Exp $ */
+/* $NetBSD: fetch.c,v 1.194 2011/09/16 15:39:26 joerg Exp $ */
/*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.193 2010/03/05 07:41:10 lukem Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.194 2011/09/16 15:39:26 joerg Exp $");
#endif /* not lint */
/*
@@ -74,7 +74,7 @@
CLASSIC_URL_T
} url_t;
-void aborthttp(int);
+__dead static void aborthttp(int);
#ifndef NO_AUTH
static int auth_url(const char *, char **, const char *, const char *);
static void base64_encode(const unsigned char *, size_t, unsigned char *);
@@ -1323,7 +1323,7 @@
/*
* Abort a HTTP retrieval
*/
-void
+static void
aborthttp(int notused)
{
char msgbuf[100];
Index: src/usr.bin/ftp/ftp.c
diff -u src/usr.bin/ftp/ftp.c:1.161 src/usr.bin/ftp/ftp.c:1.162
--- src/usr.bin/ftp/ftp.c:1.161 Sun Aug 14 12:58:15 2011
+++ src/usr.bin/ftp/ftp.c Fri Sep 16 15:39:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.161 2011/08/14 12:58:15 christos Exp $ */
+/* $NetBSD: ftp.c,v 1.162 2011/09/16 15:39:26 joerg Exp $ */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
-__RCSID("$NetBSD: ftp.c,v 1.161 2011/08/14 12:58:15 christos Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.162 2011/09/16 15:39:26 joerg Exp $");
#endif
#endif /* not lint */
@@ -131,6 +131,7 @@
char pasv[BUFSIZ]; /* passive port for proxy data connection */
static int empty(FILE *, FILE *, int);
+__dead static void abort_squared(int);
struct sockinet {
union sockunion {
@@ -537,7 +538,7 @@
sigjmp_buf xferabort;
-void
+__dead static void
abortxfer(int notused)
{
char msgbuf[100];
@@ -1819,7 +1820,7 @@
}
}
-void
+__dead static void
abortpt(int notused)
{
@@ -2031,7 +2032,7 @@
* too impatient to wait or there's another problem then ftp really
* needs to get back to a known state.
*/
-void
+static void
abort_squared(int dummy)
{
char msgbuf[100];
Index: src/usr.bin/ftp/main.c
diff -u src/usr.bin/ftp/main.c:1.118 src/usr.bin/ftp/main.c:1.119
--- src/usr.bin/ftp/main.c:1.118 Sun Aug 14 12:58:15 2011
+++ src/usr.bin/ftp/main.c Fri Sep 16 15:39:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.118 2011/08/14 12:58:15 christos Exp $ */
+/* $NetBSD: main.c,v 1.119 2011/09/16 15:39:26 joerg Exp $ */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: main.c,v 1.118 2011/08/14 12:58:15 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.119 2011/09/16 15:39:26 joerg Exp $");
#endif
#endif /* not lint */
@@ -129,8 +129,8 @@
#define NO_PROXY "no_proxy" /* env var with list of non-proxied
* hosts, comma or space separated */
+__dead static void usage(void);
static void setupoption(const char *, const char *, const char *);
-int main(int, char *[]);
int
main(int volatile argc, char **volatile argv)
Index: src/usr.bin/grep/grep.c
diff -u src/usr.bin/grep/grep.c:1.9 src/usr.bin/grep/grep.c:1.10
--- src/usr.bin/grep/grep.c:1.9 Mon Apr 18 23:22:42 2011
+++ src/usr.bin/grep/grep.c Fri Sep 16 15:39:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: grep.c,v 1.9 2011/04/18 23:22:42 joerg Exp $ */
+/* $NetBSD: grep.c,v 1.10 2011/09/16 15:39:26 joerg Exp $ */
/* $FreeBSD: head/usr.bin/grep/grep.c 211519 2010-08-19 22:55:17Z delphij $ */
/* $OpenBSD: grep.c,v 1.42 2010/07/02 22:18:03 tedu Exp $ */
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: grep.c,v 1.9 2011/04/18 23:22:42 joerg Exp $");
+__RCSID("$NetBSD: grep.c,v 1.10 2011/09/16 15:39:26 joerg Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -157,7 +157,7 @@
/*
* Prints usage information and returns 2.
*/
-static void
+__dead static void
usage(void)
{
fprintf(stderr, getstr(4), __progname);
Index: src/usr.bin/iconv/iconv.c
diff -u src/usr.bin/iconv/iconv.c:1.16 src/usr.bin/iconv/iconv.c:1.17
--- src/usr.bin/iconv/iconv.c:1.16 Fri Feb 20 15:28:21 2009
+++ src/usr.bin/iconv/iconv.c Fri Sep 16 15:39:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iconv.c,v 1.16 2009/02/20 15:28:21 yamt Exp $ */
+/* $NetBSD: iconv.c,v 1.17 2011/09/16 15:39:26 joerg Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: iconv.c,v 1.16 2009/02/20 15:28:21 yamt Exp $");
+__RCSID("$NetBSD: iconv.c,v 1.17 2011/09/16 15:39:26 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include <err.h>
@@ -42,7 +42,7 @@
#include <unistd.h>
#include <util.h>
-static void usage(void) __unused;
+static void usage(void) __dead;
static int scmp(const void *, const void *);
static void show_codesets(void);
static void do_conv(const char *, FILE *, const char *, const char *, int, int);
Index: src/usr.bin/id/id.c
diff -u src/usr.bin/id/id.c:1.31 src/usr.bin/id/id.c:1.32
--- src/usr.bin/id/id.c:1.31 Sun Apr 12 10:51:38 2009
+++ src/usr.bin/id/id.c Fri Sep 16 15:39:26 2011
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)id.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: id.c,v 1.31 2009/04/12 10:51:38 lukem Exp $");
+__RCSID("$NetBSD: id.c,v 1.32 2011/09/16 15:39:26 joerg Exp $");
#endif
#endif /* not lint */
@@ -55,7 +55,7 @@
static void current(void);
static void pretty(struct passwd *);
static void group(struct passwd *, int);
-static void usage(void);
+__dead static void usage(void);
static void user(struct passwd *);
static struct passwd *who(char *);
Index: src/usr.bin/ktrace/ktrace.c
diff -u src/usr.bin/ktrace/ktrace.c:1.44 src/usr.bin/ktrace/ktrace.c:1.45
--- src/usr.bin/ktrace/ktrace.c:1.44 Sat Feb 5 15:22:17 2011
+++ src/usr.bin/ktrace/ktrace.c Fri Sep 16 15:39:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ktrace.c,v 1.44 2011/02/05 15:22:17 yamt Exp $ */
+/* $NetBSD: ktrace.c,v 1.45 2011/09/16 15:39:26 joerg Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)ktrace.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: ktrace.c,v 1.44 2011/02/05 15:22:17 yamt Exp $");
+__RCSID("$NetBSD: ktrace.c,v 1.45 2011/09/16 15:39:26 joerg Exp $");
#endif
#endif /* not lint */
@@ -66,11 +66,10 @@
#include "setemul.h"
#endif
-int main(int, char *[]);
static int rpid(char *);
-static void usage(void);
+__dead static void usage(void);
static int do_ktrace(const char *, int, int, int, int, int);
-static void no_ktrace(int);
+__dead static void no_ktrace(int);
static void fset(int fd, int flag);
static void fclear(int fd, int flag);
Index: src/usr.bin/last/last.c
diff -u src/usr.bin/last/last.c:1.34 src/usr.bin/last/last.c:1.35
--- src/usr.bin/last/last.c:1.34 Sat Jun 5 03:24:01 2010
+++ src/usr.bin/last/last.c Fri Sep 16 15:39:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: last.c,v 1.34 2010/06/05 03:24:01 dholland Exp $ */
+/* $NetBSD: last.c,v 1.35 2011/09/16 15:39:27 joerg Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)last.c 8.2 (Berkeley) 4/2/94";
#endif
-__RCSID("$NetBSD: last.c,v 1.34 2010/06/05 03:24:01 dholland Exp $");
+__RCSID("$NetBSD: last.c,v 1.35 2011/09/16 15:39:27 joerg Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -113,8 +113,6 @@
static int fulltime = 0; /* Display seconds? */
static int xflag; /* Assume file is wtmpx format */
-int main(int, char *[]);
-
static void addarg(int, const char *);
static TTY *addtty(const char *);
static void hostconv(char *);
@@ -126,7 +124,7 @@
static void wtmp(const char *, int, int, int, int);
#endif
static char *fmttime(time_t, int);
-static void usage(void);
+__dead static void usage(void);
static
void usage(void)
Index: src/usr.bin/last/want.c
diff -u src/usr.bin/last/want.c:1.13 src/usr.bin/last/want.c:1.14
--- src/usr.bin/last/want.c:1.13 Sun Apr 12 13:07:21 2009
+++ src/usr.bin/last/want.c Fri Sep 16 15:39:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: want.c,v 1.13 2009/04/12 13:07:21 lukem Exp $ */
+/* $NetBSD: want.c,v 1.14 2011/09/16 15:39:27 joerg Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -63,7 +63,7 @@
* wtmp --
* read through the wtmp file
*/
-void
+static void
wtmp(const char *file, int namesz, int linesz, int hostsz, int numeric)
{
struct utmp *bp; /* current structure */
Index: src/usr.bin/leave/leave.c
diff -u src/usr.bin/leave/leave.c:1.14 src/usr.bin/leave/leave.c:1.15
--- src/usr.bin/leave/leave.c:1.14 Mon Jul 21 14:19:23 2008
+++ src/usr.bin/leave/leave.c Fri Sep 16 15:39:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: leave.c,v 1.14 2008/07/21 14:19:23 lukem Exp $ */
+/* $NetBSD: leave.c,v 1.15 2011/09/16 15:39:27 joerg Exp $ */
/*
* Copyright (c) 1980, 1988, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)leave.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: leave.c,v 1.14 2008/07/21 14:19:23 lukem Exp $");
+__RCSID("$NetBSD: leave.c,v 1.15 2011/09/16 15:39:27 joerg Exp $");
#endif
#endif /* not lint */
@@ -64,10 +64,8 @@
* It nags you like a mother hen.
*/
-int main(int argc, char **argv);
-
-static void doalarm(u_int);
-static void usage(void);
+__dead static void doalarm(u_int);
+__dead static void usage(void);
int
main(int argc, char **argv)
Index: src/usr.bin/mail/cmd1.c
diff -u src/usr.bin/mail/cmd1.c:1.30 src/usr.bin/mail/cmd1.c:1.31
--- src/usr.bin/mail/cmd1.c:1.30 Fri Apr 10 13:08:24 2009
+++ src/usr.bin/mail/cmd1.c Fri Sep 16 15:39:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cmd1.c,v 1.30 2009/04/10 13:08:24 christos Exp $ */
+/* $NetBSD: cmd1.c,v 1.31 2011/09/16 15:39:27 joerg Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmd1.c 8.2 (Berkeley) 4/20/95";
#else
-__RCSID("$NetBSD: cmd1.c,v 1.30 2009/04/10 13:08:24 christos Exp $");
+__RCSID("$NetBSD: cmd1.c,v 1.31 2011/09/16 15:39:27 joerg Exp $");
#endif
#endif /* not lint */
@@ -300,7 +300,7 @@
static jmp_buf pipestop;
/*ARGSUSED*/
-static void
+__dead static void
cmd1_brokpipe(int signo __unused)
{
Index: src/usr.bin/mail/collect.c
diff -u src/usr.bin/mail/collect.c:1.43 src/usr.bin/mail/collect.c:1.44
--- src/usr.bin/mail/collect.c:1.43 Fri Apr 10 13:08:24 2009
+++ src/usr.bin/mail/collect.c Fri Sep 16 15:39:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: collect.c,v 1.43 2009/04/10 13:08:24 christos Exp $ */
+/* $NetBSD: collect.c,v 1.44 2011/09/16 15:39:27 joerg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)collect.c 8.2 (Berkeley) 4/19/94";
#else
-__RCSID("$NetBSD: collect.c,v 1.43 2009/04/10 13:08:24 christos Exp $");
+__RCSID("$NetBSD: collect.c,v 1.44 2011/09/16 15:39:27 joerg Exp $");
#endif
#endif /* not lint */
@@ -325,7 +325,7 @@
}
/*ARGSUSED*/
-static void
+__dead static void
coll_hup(int signo __unused)
{
Index: src/usr.bin/mail/lex.c
diff -u src/usr.bin/mail/lex.c:1.39 src/usr.bin/mail/lex.c:1.40
--- src/usr.bin/mail/lex.c:1.39 Tue Jan 12 14:45:31 2010
+++ src/usr.bin/mail/lex.c Fri Sep 16 15:39:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.39 2010/01/12 14:45:31 christos Exp $ */
+/* $NetBSD: lex.c,v 1.40 2011/09/16 15:39:27 joerg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)lex.c 8.2 (Berkeley) 4/20/95";
#else
-__RCSID("$NetBSD: lex.c,v 1.39 2010/01/12 14:45:31 christos Exp $");
+__RCSID("$NetBSD: lex.c,v 1.40 2011/09/16 15:39:27 joerg Exp $");
#endif
#endif /* not lint */
@@ -337,7 +337,7 @@
static jmp_buf pipestop;
/*ARGSUSED*/
-static void
+__dead static void
lex_brokpipe(int signo)
{
@@ -785,7 +785,7 @@
* Close all open files except 0, 1, 2, and the temporary.
* Also, unstack all source files.
*/
-static void
+__dead static void
lex_intr(int signo)
{
@@ -811,7 +811,7 @@
* Branch here on hangup signal and simulate "exit".
*/
/*ARGSUSED*/
-static void
+__dead static void
lex_hangup(int s __unused)
{
Index: src/usr.bin/mail/tty.c
diff -u src/usr.bin/mail/tty.c:1.28 src/usr.bin/mail/tty.c:1.29
--- src/usr.bin/mail/tty.c:1.28 Fri Apr 10 13:08:25 2009
+++ src/usr.bin/mail/tty.c Fri Sep 16 15:39:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.28 2009/04/10 13:08:25 christos Exp $ */
+/* $NetBSD: tty.c,v 1.29 2011/09/16 15:39:27 joerg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tty.c 8.2 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: tty.c,v 1.28 2009/04/10 13:08:25 christos Exp $");
+__RCSID("$NetBSD: tty.c,v 1.29 2011/09/16 15:39:27 joerg Exp $");
#endif
#endif /* not lint */
@@ -269,7 +269,7 @@
}
/*ARGSUSED*/
-static void
+__dead static void
tty_sigint(int signo __unused)
{
Index: src/usr.bin/mkcsmapper/yacc.y
diff -u src/usr.bin/mkcsmapper/yacc.y:1.8 src/usr.bin/mkcsmapper/yacc.y:1.9
--- src/usr.bin/mkcsmapper/yacc.y:1.8 Tue May 24 12:35:01 2011
+++ src/usr.bin/mkcsmapper/yacc.y Fri Sep 16 15:39:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: yacc.y,v 1.8 2011/05/24 12:35:01 joerg Exp $ */
+/* $NetBSD: yacc.y,v 1.9 2011/09/16 15:39:27 joerg Exp $ */
%{
/*-
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: yacc.y,v 1.8 2011/05/24 12:35:01 joerg Exp $");
+__RCSID("$NetBSD: yacc.y,v 1.9 2011/09/16 15:39:27 joerg Exp $");
#endif /* not lint */
#include <assert.h>
@@ -670,7 +670,7 @@
errx(EXIT_FAILURE, "%s\n", strerror(ret));
}
-static void
+__dead static void
usage(void)
{
warnx("usage: \n"
Index: src/usr.bin/mkesdb/yacc.y
diff -u src/usr.bin/mkesdb/yacc.y:1.5 src/usr.bin/mkesdb/yacc.y:1.6
--- src/usr.bin/mkesdb/yacc.y:1.5 Tue May 24 12:35:36 2011
+++ src/usr.bin/mkesdb/yacc.y Fri Sep 16 15:39:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: yacc.y,v 1.5 2011/05/24 12:35:36 joerg Exp $ */
+/* $NetBSD: yacc.y,v 1.6 2011/09/16 15:39:27 joerg Exp $ */
%{
/*-
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: yacc.y,v 1.5 2011/05/24 12:35:36 joerg Exp $");
+__RCSID("$NetBSD: yacc.y,v 1.6 2011/09/16 15:39:27 joerg Exp $");
#endif /* not lint */
#include <assert.h>
@@ -287,7 +287,7 @@
errx(EXIT_FAILURE, "%s\n", strerror(ret));
}
-static void
+__dead static void
usage(void)
{
errx(EXIT_FAILURE,
Index: src/usr.bin/netstat/if.c
diff -u src/usr.bin/netstat/if.c:1.71 src/usr.bin/netstat/if.c:1.72
--- src/usr.bin/netstat/if.c:1.71 Fri Feb 4 14:31:23 2011
+++ src/usr.bin/netstat/if.c Fri Sep 16 15:39:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.71 2011/02/04 14:31:23 martin Exp $ */
+/* $NetBSD: if.c,v 1.72 2011/09/16 15:39:27 joerg Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)if.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: if.c,v 1.71 2011/02/04 14:31:23 martin Exp $");
+__RCSID("$NetBSD: if.c,v 1.72 2011/09/16 15:39:27 joerg Exp $");
#endif
#endif /* not lint */
@@ -637,7 +637,7 @@
printf(" %5llu", (unsigned long long)(cur->ift_dr - old->ift_dr));
}
-static void
+__dead static void
sidewaysintpr_sysctl(unsigned interval)
{
sigset_t emptyset;
Index: src/usr.bin/netstat/main.c
diff -u src/usr.bin/netstat/main.c:1.80 src/usr.bin/netstat/main.c:1.81
--- src/usr.bin/netstat/main.c:1.80 Sun Jul 17 10:22:07 2011
+++ src/usr.bin/netstat/main.c Fri Sep 16 15:39:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.80 2011/07/17 10:22:07 njoly Exp $ */
+/* $NetBSD: main.c,v 1.81 2011/09/16 15:39:27 joerg Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "from: @(#)main.c 8.4 (Berkeley) 3/1/94";
#else
-__RCSID("$NetBSD: main.c,v 1.80 2011/07/17 10:22:07 njoly Exp $");
+__RCSID("$NetBSD: main.c,v 1.81 2011/09/16 15:39:27 joerg Exp $");
#endif
#endif /* not lint */
@@ -344,7 +344,7 @@
int main __P((int, char *[]));
static void printproto __P((struct protox *, const char *));
static void print_softintrq __P((void));
-static void usage __P((void));
+__dead static void usage(void);
static struct protox *name2protox __P((const char *));
static struct protox *knownname __P((const char *));
static void prepare(const char *, const char *, struct protox *tp);
Index: src/usr.bin/newgrp/newgrp.c
diff -u src/usr.bin/newgrp/newgrp.c:1.6 src/usr.bin/newgrp/newgrp.c:1.7
--- src/usr.bin/newgrp/newgrp.c:1.6 Mon Apr 28 20:24:14 2008
+++ src/usr.bin/newgrp/newgrp.c Fri Sep 16 15:39:27 2011
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: newgrp.c,v 1.6 2008/04/28 20:24:14 martin Exp $");
+__RCSID("$NetBSD: newgrp.c,v 1.7 2011/09/16 15:39:27 joerg Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -52,7 +52,7 @@
#include "grutil.h"
-static void
+__dead static void
usage(void)
{
(void)fprintf(stderr, "usage: %s [-l] [group]\n", getprogname());
Index: src/usr.bin/passwd/extern.h
diff -u src/usr.bin/passwd/extern.h:1.13 src/usr.bin/passwd/extern.h:1.14
--- src/usr.bin/passwd/extern.h:1.13 Thu Mar 23 23:37:07 2006
+++ src/usr.bin/passwd/extern.h Fri Sep 16 15:39:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.13 2006/03/23 23:37:07 wiz Exp $ */
+/* $NetBSD: extern.h,v 1.14 2011/09/16 15:39:27 joerg Exp $ */
/*
* Copyright (c) 1994
@@ -33,7 +33,7 @@
#ifdef USE_PAM
-void usage(void);
+__dead void usage(void);
#ifdef KERBEROS5
void pwkrb5_usage(const char *);
Index: src/usr.bin/passwd/yp_passwd.c
diff -u src/usr.bin/passwd/yp_passwd.c:1.35 src/usr.bin/passwd/yp_passwd.c:1.36
--- src/usr.bin/passwd/yp_passwd.c:1.35 Wed Sep 8 13:58:46 2010
+++ src/usr.bin/passwd/yp_passwd.c Fri Sep 16 15:39:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: yp_passwd.c,v 1.35 2010/09/08 13:58:46 christos Exp $ */
+/* $NetBSD: yp_passwd.c,v 1.36 2011/09/16 15:39:27 joerg Exp $ */
/*
* Copyright (c) 1988, 1990, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)local_passwd.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: yp_passwd.c,v 1.35 2010/09/08 13:58:46 christos Exp $");
+__RCSID("$NetBSD: yp_passwd.c,v 1.36 2011/09/16 15:39:27 joerg Exp $");
#endif
#endif /* not lint */
@@ -70,7 +70,7 @@
static uid_t uid;
static char *domain;
-static void
+__dead static void
pwerror(const char *name, int show_err, int eval)
{
Index: src/usr.bin/pathchk/pathchk.c
diff -u src/usr.bin/pathchk/pathchk.c:1.1 src/usr.bin/pathchk/pathchk.c:1.2
--- src/usr.bin/pathchk/pathchk.c:1.1 Tue Apr 15 19:46:40 2003
+++ src/usr.bin/pathchk/pathchk.c Fri Sep 16 15:39:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pathchk.c,v 1.1 2003/04/15 19:46:40 jdolecek Exp $ */
+/* $NetBSD: pathchk.c,v 1.2 2011/09/16 15:39:28 joerg Exp $ */
/*-
* Copyright (c) 2002 Tim J. Robbins.
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: pathchk.c,v 1.1 2003/04/15 19:46:40 jdolecek Exp $");
+__RCSID("$NetBSD: pathchk.c,v 1.2 2011/09/16 15:39:28 joerg Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -46,7 +46,7 @@
static int check(const char *);
static int portable(const char *);
-static void usage(void);
+__dead static void usage(void);
static int pflag; /* Perform portability checks */
Index: src/usr.bin/progress/progress.c
diff -u src/usr.bin/progress/progress.c:1.18 src/usr.bin/progress/progress.c:1.19
--- src/usr.bin/progress/progress.c:1.18 Sat Jul 17 10:51:03 2010
+++ src/usr.bin/progress/progress.c Fri Sep 16 15:39:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: progress.c,v 1.18 2010/07/17 10:51:03 tron Exp $ */
+/* $NetBSD: progress.c,v 1.19 2011/09/16 15:39:28 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: progress.c,v 1.18 2010/07/17 10:51:03 tron Exp $");
+__RCSID("$NetBSD: progress.c,v 1.19 2011/09/16 15:39:28 joerg Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -64,8 +64,7 @@
#include "progressbar.h"
static void broken_pipe(int unused);
-static void usage(void);
-int main(int, char *[]);
+__dead static void usage(void);
static void
broken_pipe(int unused)
Index: src/usr.bin/pwhash/pwhash.c
diff -u src/usr.bin/pwhash/pwhash.c:1.14 src/usr.bin/pwhash/pwhash.c:1.15
--- src/usr.bin/pwhash/pwhash.c:1.14 Sun Mar 5 08:50:58 2006
+++ src/usr.bin/pwhash/pwhash.c Fri Sep 16 15:39:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pwhash.c,v 1.14 2006/03/05 08:50:58 christos Exp $ */
+/* $NetBSD: pwhash.c,v 1.15 2011/09/16 15:39:28 joerg Exp $ */
/* $OpenBSD: encrypt.c,v 1.16 2002/02/16 21:27:45 millert Exp $ */
/*
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: pwhash.c,v 1.14 2006/03/05 08:50:58 christos Exp $");
+__RCSID("$NetBSD: pwhash.c,v 1.15 2011/09/16 15:39:28 joerg Exp $");
#endif
#include <sys/types.h>
@@ -55,7 +55,7 @@
#define DO_BLF 3
#define DO_SHA1 4
-static void
+__dead static void
usage(void)
{
Index: src/usr.bin/rev/rev.c
diff -u src/usr.bin/rev/rev.c:1.11 src/usr.bin/rev/rev.c:1.12
--- src/usr.bin/rev/rev.c:1.11 Tue Jul 21 01:25:14 2009
+++ src/usr.bin/rev/rev.c Fri Sep 16 15:39:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rev.c,v 1.11 2009/07/21 01:25:14 ahoka Exp $ */
+/* $NetBSD: rev.c,v 1.12 2011/09/16 15:39:28 joerg Exp $ */
/*-
* Copyright (c) 1987, 1992, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)rev.c 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: rev.c,v 1.11 2009/07/21 01:25:14 ahoka Exp $");
+__RCSID("$NetBSD: rev.c,v 1.12 2011/09/16 15:39:28 joerg Exp $");
#endif
#endif /* not lint */
@@ -53,8 +53,7 @@
#include <unistd.h>
#include <wchar.h>
-static void usage(void);
-int main(int, char *[]);
+__dead static void usage(void);
int
main(int argc, char *argv[])
Index: src/usr.bin/rpcinfo/rpcinfo.c
diff -u src/usr.bin/rpcinfo/rpcinfo.c:1.33 src/usr.bin/rpcinfo/rpcinfo.c:1.34
--- src/usr.bin/rpcinfo/rpcinfo.c:1.33 Tue May 24 12:42:25 2011
+++ src/usr.bin/rpcinfo/rpcinfo.c Fri Sep 16 15:39:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcinfo.c,v 1.33 2011/05/24 12:42:25 joerg Exp $ */
+/* $NetBSD: rpcinfo.c,v 1.34 2011/09/16 15:39:28 joerg Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -137,7 +137,7 @@
#endif
static bool_t reply_proc(void *, struct netbuf *, struct netconfig *);
-static void brdcst(int, char **);
+__dead static void brdcst(int, char **);
static void addrping(const char *, const char *, int, char **);
static void progping(const char *, int, char **);
static CLIENT *clnt_addr_create(const char *, const struct netconfig *,
Index: src/usr.bin/rump_allserver/rump_allserver.c
diff -u src/usr.bin/rump_allserver/rump_allserver.c:1.21 src/usr.bin/rump_allserver/rump_allserver.c:1.22
--- src/usr.bin/rump_allserver/rump_allserver.c:1.21 Tue Feb 22 15:51:59 2011
+++ src/usr.bin/rump_allserver/rump_allserver.c Fri Sep 16 15:39:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_allserver.c,v 1.21 2011/02/22 15:51:59 pooka Exp $ */
+/* $NetBSD: rump_allserver.c,v 1.22 2011/09/16 15:39:28 joerg Exp $ */
/*-
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rump_allserver.c,v 1.21 2011/02/22 15:51:59 pooka Exp $");
+__RCSID("$NetBSD: rump_allserver.c,v 1.22 2011/09/16 15:39:28 joerg Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -49,7 +49,7 @@
#include <unistd.h>
#include <util.h>
-static void
+__dead static void
usage(void)
{
@@ -58,7 +58,7 @@
exit(1);
}
-static void
+__dead static void
die(int sflag, int error, const char *reason)
{
Index: src/usr.bin/rump_dhcpclient/main.c
diff -u src/usr.bin/rump_dhcpclient/main.c:1.2 src/usr.bin/rump_dhcpclient/main.c:1.3
--- src/usr.bin/rump_dhcpclient/main.c:1.2 Mon Mar 14 23:02:16 2011
+++ src/usr.bin/rump_dhcpclient/main.c Fri Sep 16 15:39:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.2 2011/03/14 23:02:16 pooka Exp $ */
+/* $NetBSD: main.c,v 1.3 2011/09/16 15:39:28 joerg Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -48,7 +48,7 @@
struct interface *ifaces;
-static void
+__dead static void
usage(void)
{
Index: src/usr.bin/rump_halt/rump.halt.c
diff -u src/usr.bin/rump_halt/rump.halt.c:1.2 src/usr.bin/rump_halt/rump.halt.c:1.3
--- src/usr.bin/rump_halt/rump.halt.c:1.2 Sat Jan 22 13:43:07 2011
+++ src/usr.bin/rump_halt/rump.halt.c Fri Sep 16 15:39:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.halt.c,v 1.2 2011/01/22 13:43:07 pooka Exp $ */
+/* $NetBSD: rump.halt.c,v 1.3 2011/09/16 15:39:28 joerg Exp $ */
/*-
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rump.halt.c,v 1.2 2011/01/22 13:43:07 pooka Exp $");
+__RCSID("$NetBSD: rump.halt.c,v 1.3 2011/09/16 15:39:28 joerg Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -45,7 +45,7 @@
#define ARGFLAGS "dhn"
-static void
+__dead static void
usage(void)
{
Index: src/usr.bin/sdpquery/sdpquery.c
diff -u src/usr.bin/sdpquery/sdpquery.c:1.6 src/usr.bin/sdpquery/sdpquery.c:1.7
--- src/usr.bin/sdpquery/sdpquery.c:1.6 Sun Aug 14 13:27:47 2011
+++ src/usr.bin/sdpquery/sdpquery.c Fri Sep 16 15:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sdpquery.c,v 1.6 2011/08/14 13:27:47 christos Exp $ */
+/* $NetBSD: sdpquery.c,v 1.7 2011/09/16 15:39:29 joerg Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -35,7 +35,7 @@
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc.\
Copyright (c) 2006 Itronix, Inc.\
All rights reserved.");
-__RCSID("$NetBSD: sdpquery.c,v 1.6 2011/08/14 13:27:47 christos Exp $");
+__RCSID("$NetBSD: sdpquery.c,v 1.7 2011/09/16 15:39:29 joerg Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -48,7 +48,7 @@
#include "sdpquery.h"
-static void usage(void);
+__dead static void usage(void);
const char *control_socket;
Index: src/usr.bin/shmif_dumpbus/shmif_dumpbus.c
diff -u src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.7 src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.8
--- src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.7 Mon Mar 14 11:13:22 2011
+++ src/usr.bin/shmif_dumpbus/shmif_dumpbus.c Fri Sep 16 15:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: shmif_dumpbus.c,v 1.7 2011/03/14 11:13:22 pooka Exp $ */
+/* $NetBSD: shmif_dumpbus.c,v 1.8 2011/09/16 15:39:29 joerg Exp $ */
/*-
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -49,7 +49,7 @@
#include "shmifvar.h"
-static void
+__dead static void
usage(void)
{
Index: src/usr.bin/shuffle/shuffle.c
diff -u src/usr.bin/shuffle/shuffle.c:1.20 src/usr.bin/shuffle/shuffle.c:1.21
--- src/usr.bin/shuffle/shuffle.c:1.20 Mon Apr 13 07:31:36 2009
+++ src/usr.bin/shuffle/shuffle.c Fri Sep 16 15:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: shuffle.c,v 1.20 2009/04/13 07:31:36 lukem Exp $ */
+/* $NetBSD: shuffle.c,v 1.21 2011/09/16 15:39:29 joerg Exp $ */
/*
* Copyright (c) 1998
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: shuffle.c,v 1.20 2009/04/13 07:31:36 lukem Exp $");
+__RCSID("$NetBSD: shuffle.c,v 1.21 2011/09/16 15:39:29 joerg Exp $");
#endif /* not lint */
#include <sys/time.h>
@@ -48,12 +48,10 @@
#include <util.h>
static size_t *get_shuffle(size_t);
-static void usage(void);
+__dead static void usage(void);
static void get_lines(const char *, char ***, size_t *);
static size_t get_number(const char *, int);
-int main(int, char *[]);
-
/*
* get_shuffle --
* Construct a random shuffle array of t elements
Index: src/usr.bin/skey/skey.c
diff -u src/usr.bin/skey/skey.c:1.17 src/usr.bin/skey/skey.c:1.18
--- src/usr.bin/skey/skey.c:1.17 Mon Nov 1 21:52:07 2004
+++ src/usr.bin/skey/skey.c Fri Sep 16 15:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: skey.c,v 1.17 2004/11/01 21:52:07 dsl Exp $ */
+/* $NetBSD: skey.c,v 1.18 2011/09/16 15:39:29 joerg Exp $ */
/*
* S/KEY v1.1b (skey.c)
@@ -23,7 +23,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: skey.c,v 1.17 2004/11/01 21:52:07 dsl Exp $");
+__RCSID("$NetBSD: skey.c,v 1.18 2011/09/16 15:39:29 joerg Exp $");
#endif
#include <ctype.h>
@@ -35,11 +35,10 @@
#include <string.h>
#include <unistd.h>
-int main(int, char **);
-void usage(char *);
+__dead static void usage(char *);
int
-main(int argc, char **argv)
+main(int argc, char **argv)
{
int n, cnt, i, pass = 0, hexmode = 0;
char passwd[SKEY_MAX_PW_LEN+1], key[SKEY_BINKEY_SIZE];
@@ -150,7 +149,7 @@
exit(0);
}
-void
+static void
usage(char *s)
{
Index: src/usr.bin/sort/sort.c
diff -u src/usr.bin/sort/sort.c:1.60 src/usr.bin/sort/sort.c:1.61
--- src/usr.bin/sort/sort.c:1.60 Sat Dec 18 23:09:48 2010
+++ src/usr.bin/sort/sort.c Fri Sep 16 15:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sort.c,v 1.60 2010/12/18 23:09:48 christos Exp $ */
+/* $NetBSD: sort.c,v 1.61 2011/09/16 15:39:29 joerg Exp $ */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
The Regents of the University of California. All rights reserved.");
#endif /* not lint */
-__RCSID("$NetBSD: sort.c,v 1.60 2010/12/18 23:09:48 christos Exp $");
+__RCSID("$NetBSD: sort.c,v 1.61 2011/09/16 15:39:29 joerg Exp $");
#include <sys/types.h>
#include <sys/time.h>
@@ -111,9 +111,7 @@
static void cleanup(void);
static void onsignal(int);
-static void usage(const char *);
-
-int main(int argc, char **argv);
+__dead static void usage(const char *);
int
main(int argc, char *argv[])
Index: src/usr.bin/sort/sort.h
diff -u src/usr.bin/sort/sort.h:1.33 src/usr.bin/sort/sort.h:1.34
--- src/usr.bin/sort/sort.h:1.33 Sat Dec 18 23:09:48 2010
+++ src/usr.bin/sort/sort.h Fri Sep 16 15:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sort.h,v 1.33 2010/12/18 23:09:48 christos Exp $ */
+/* $NetBSD: sort.h,v 1.34 2011/09/16 15:39:29 joerg Exp $ */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -191,7 +191,7 @@
int makeline(FILE *, RECHEADER *, u_char *, struct field *);
void makeline_copydown(RECHEADER *);
int optval(int, int);
-void order(struct filelist *, struct field *);
+__dead void order(struct filelist *, struct field *);
void putline(const RECHEADER *, FILE *);
void putrec(const RECHEADER *, FILE *);
void putkeydump(const RECHEADER *, FILE *);
Index: src/usr.bin/split/split.c
diff -u src/usr.bin/split/split.c:1.25 src/usr.bin/split/split.c:1.26
--- src/usr.bin/split/split.c:1.25 Mon Apr 13 11:17:06 2009
+++ src/usr.bin/split/split.c Fri Sep 16 15:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: split.c,v 1.25 2009/04/13 11:17:06 lukem Exp $ */
+/* $NetBSD: split.c,v 1.26 2011/09/16 15:39:29 joerg Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)split.c 8.3 (Berkeley) 4/25/94";
#endif
-__RCSID("$NetBSD: split.c,v 1.25 2009/04/13 11:17:06 lukem Exp $");
+__RCSID("$NetBSD: split.c,v 1.26 2011/09/16 15:39:29 joerg Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -60,11 +60,10 @@
static char *fname; /* File name prefix. */
static size_t sfxlen = 2; /* suffix length. */
-int main(int, char **);
static void newfile(void);
-static void split1(off_t, int);
-static void split2(off_t);
-static void split3(off_t);
+static void split1(off_t, int) __dead;
+static void split2(off_t) __dead;
+static void split3(off_t) __dead;
static void usage(void) __dead;
static size_t bigwrite(int, void const *, size_t);
Index: src/usr.bin/tabs/tabs.c
diff -u src/usr.bin/tabs/tabs.c:1.3 src/usr.bin/tabs/tabs.c:1.4
--- src/usr.bin/tabs/tabs.c:1.3 Wed Feb 3 15:34:46 2010
+++ src/usr.bin/tabs/tabs.c Fri Sep 16 15:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tabs.c,v 1.3 2010/02/03 15:34:46 roy Exp $ */
+/* $NetBSD: tabs.c,v 1.4 2011/09/16 15:39:29 joerg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 2008 \
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: tabs.c,v 1.3 2010/02/03 15:34:46 roy Exp $");
+__RCSID("$NetBSD: tabs.c,v 1.4 2011/09/16 15:39:29 joerg Exp $");
#endif /* not lint */
#include <sys/ioctl.h>
@@ -67,7 +67,7 @@
};
static const size_t ntabspecs = sizeof(tabspecs) / sizeof(tabspecs[0]);
-static void
+__dead static void
usage(void)
{
fprintf(stderr,
Index: src/usr.bin/tftp/main.c
diff -u src/usr.bin/tftp/main.c:1.26 src/usr.bin/tftp/main.c:1.27
--- src/usr.bin/tftp/main.c:1.26 Mon Jul 21 14:19:26 2008
+++ src/usr.bin/tftp/main.c Fri Sep 16 15:39:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.26 2008/07/21 14:19:26 lukem Exp $ */
+/* $NetBSD: main.c,v 1.27 2011/09/16 15:39:30 joerg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -36,7 +36,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: main.c,v 1.26 2008/07/21 14:19:26 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.27 2011/09/16 15:39:30 joerg Exp $");
#endif
#endif /* not lint */
@@ -94,7 +94,7 @@
void help __P((int, char **));
void modecmd __P((int, char **));
void put __P((int, char **));
-void quit __P((int, char **));
+__dead static void quit __P((int, char **));
void setascii __P((int, char **));
void setbinary __P((int, char **));
void setpeer0 __P((const char *, const char *));
@@ -108,8 +108,7 @@
void settimeoutopt __P((int, char **));
void status __P((int, char **));
char *tail __P((char *));
-int main __P((int, char *[]));
-void intr __P((int));
+__dead static void intr __P((int));
const struct cmd *getcmd __P((char *));
static __dead void command __P((void));
Index: src/usr.bin/tftp/tftp.c
diff -u src/usr.bin/tftp/tftp.c:1.30 src/usr.bin/tftp/tftp.c:1.31
--- src/usr.bin/tftp/tftp.c:1.30 Sun Jan 18 07:11:45 2009
+++ src/usr.bin/tftp/tftp.c Fri Sep 16 15:39:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tftp.c,v 1.30 2009/01/18 07:11:45 lukem Exp $ */
+/* $NetBSD: tftp.c,v 1.31 2011/09/16 15:39:30 joerg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tftp.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: tftp.c,v 1.30 2009/01/18 07:11:45 lukem Exp $");
+__RCSID("$NetBSD: tftp.c,v 1.31 2011/09/16 15:39:30 joerg Exp $");
#endif
#endif /* not lint */
@@ -77,7 +77,7 @@
static void printstats __P((const char *, unsigned long));
static void startclock __P((void));
static void stopclock __P((void));
-static void timer __P((int));
+__dead static void timer __P((int));
static void tpacket __P((const char *, struct tftphdr *, int));
static int cmpport __P((struct sockaddr *, struct sockaddr *));
Index: src/usr.bin/unifdef/unifdef.c
diff -u src/usr.bin/unifdef/unifdef.c:1.19 src/usr.bin/unifdef/unifdef.c:1.20
--- src/usr.bin/unifdef/unifdef.c:1.19 Thu Jan 20 15:24:24 2011
+++ src/usr.bin/unifdef/unifdef.c Fri Sep 16 15:39:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: unifdef.c,v 1.19 2011/01/20 15:24:24 ginsbach Exp $ */
+/* $NetBSD: unifdef.c,v 1.20 2011/09/16 15:39:30 joerg Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -77,7 +77,7 @@
#endif
#ifdef __IDSTRING
__IDSTRING(Berkeley, "@(#)unifdef.c 8.1 (Berkeley) 6/6/93");
-__IDSTRING(NetBSD, "$NetBSD: unifdef.c,v 1.19 2011/01/20 15:24:24 ginsbach Exp $");
+__IDSTRING(NetBSD, "$NetBSD: unifdef.c,v 1.20 2011/09/16 15:39:30 joerg Exp $");
__IDSTRING(dotat, "$dotat: things/unifdef.c,v 1.161 2003/07/01 15:32:48 fanf2 Exp $");
#endif
#endif /* not lint */
@@ -242,8 +242,8 @@
static void addsym(bool, bool, char *);
static void debug(const char *, ...);
-static void done(void);
-static void error(const char *);
+__dead static void done(void);
+__dead static void error(const char *);
static int findsym(const char *);
static void flushline(bool);
static Linetype get_line(void);
@@ -252,12 +252,12 @@
static void ignoreon(void);
static void keywordedit(const char *);
static void nest(void);
-static void process(void);
+__dead static void process(void);
static const char *skipcomment(const char *);
static const char *skipsym(const char *);
static void state(Ifstate);
static int strlcmp(const char *, const char *, size_t);
-static void usage(void);
+__dead static void usage(void);
#define endsym(c) (!isalpha((unsigned char)c) && !isdigit((unsigned char)c) && c != '_')
@@ -409,11 +409,11 @@
typedef void state_fn(void);
/* report an error */
-static void Eelif (void) { error("Inappropriate #elif"); }
-static void Eelse (void) { error("Inappropriate #else"); }
-static void Eendif(void) { error("Inappropriate #endif"); }
-static void Eeof (void) { error("Premature EOF"); }
-static void Eioccc(void) { error("Obfuscated preprocessor control line"); }
+__dead static void Eelif (void) { error("Inappropriate #elif"); }
+__dead static void Eelse (void) { error("Inappropriate #else"); }
+__dead static void Eendif(void) { error("Inappropriate #endif"); }
+__dead static void Eeof (void) { error("Premature EOF"); }
+__dead static void Eioccc(void) { error("Obfuscated preprocessor control line"); }
/* plain line handling */
static void print (void) { flushline(true); }
static void drop (void) { flushline(false); }
Index: src/usr.bin/usbhidctl/usbhid.c
diff -u src/usr.bin/usbhidctl/usbhid.c:1.35 src/usr.bin/usbhidctl/usbhid.c:1.36
--- src/usr.bin/usbhidctl/usbhid.c:1.35 Tue Apr 14 06:14:10 2009
+++ src/usr.bin/usbhidctl/usbhid.c Fri Sep 16 15:39:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: usbhid.c,v 1.35 2009/04/14 06:14:10 lukem Exp $ */
+/* $NetBSD: usbhid.c,v 1.36 2011/09/16 15:39:30 joerg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: usbhid.c,v 1.35 2009/04/14 06:14:10 lukem Exp $");
+__RCSID("$NetBSD: usbhid.c,v 1.36 2011/09/16 15:39:30 joerg Exp $");
#endif
#include <sys/types.h>
@@ -54,7 +54,7 @@
* Zero if not in a verbose mode. Greater levels of verbosity
* are indicated by values larger than one.
*/
-unsigned int verbose;
+static unsigned int verbose;
/* Parser tokens */
#define DELIM_USAGE '.'
@@ -621,7 +621,7 @@
return 0;
}
-static void
+__dead static void
devloop(int hidfd, report_desc_t rd, struct Susbvar *varlist, size_t vlsize)
{
u_char *dbuf;
@@ -798,7 +798,7 @@
}
}
-static void
+__dead static void
usage(void)
{
const char *progname = getprogname();
Index: src/usr.bin/uuencode/uuencode.c
diff -u src/usr.bin/uuencode/uuencode.c:1.14 src/usr.bin/uuencode/uuencode.c:1.15
--- src/usr.bin/uuencode/uuencode.c:1.14 Sat Nov 29 22:36:13 2008
+++ src/usr.bin/uuencode/uuencode.c Fri Sep 16 15:39:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uuencode.c,v 1.14 2008/11/29 22:36:13 dholland Exp $ */
+/* $NetBSD: uuencode.c,v 1.15 2011/09/16 15:39:30 joerg Exp $ */
/*-
* Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)uuencode.c 8.2 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: uuencode.c,v 1.14 2008/11/29 22:36:13 dholland Exp $");
+__RCSID("$NetBSD: uuencode.c,v 1.15 2011/09/16 15:39:30 joerg Exp $");
#endif
#endif /* not lint */
@@ -60,10 +60,9 @@
#include <string.h>
#include <unistd.h>
-int main(int, char *[]);
static void encode(void);
static void base64_encode(void);
-static void usage(void);
+__dead static void usage(void);
int
main(int argc, char *argv[])
Index: src/usr.bin/uuidgen/uuidgen.c
diff -u src/usr.bin/uuidgen/uuidgen.c:1.3 src/usr.bin/uuidgen/uuidgen.c:1.4
--- src/usr.bin/uuidgen/uuidgen.c:1.3 Mon Apr 28 20:24:15 2008
+++ src/usr.bin/uuidgen/uuidgen.c Fri Sep 16 15:39:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uuidgen.c,v 1.3 2008/04/28 20:24:15 martin Exp $ */
+/* $NetBSD: uuidgen.c,v 1.4 2011/09/16 15:39:30 joerg Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: uuidgen.c,v 1.3 2008/04/28 20:24:15 martin Exp $");
+__RCSID("$NetBSD: uuidgen.c,v 1.4 2011/09/16 15:39:30 joerg Exp $");
#include <err.h>
#include <stdio.h>
@@ -64,7 +64,7 @@
#include <unistd.h>
#include <uuid.h>
-static void
+__dead static void
usage(void)
{
Index: src/usr.bin/videoctl/videoctl.c
diff -u src/usr.bin/videoctl/videoctl.c:1.1 src/usr.bin/videoctl/videoctl.c:1.2
--- src/usr.bin/videoctl/videoctl.c:1.1 Sun Dec 26 10:37:15 2010
+++ src/usr.bin/videoctl/videoctl.c Fri Sep 16 15:39:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: videoctl.c,v 1.1 2010/12/26 10:37:15 jmcneill Exp $ */
+/* $NetBSD: videoctl.c,v 1.2 2011/09/16 15:39:30 joerg Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2010\
Jared D. McNeill <jmcne...@invisible.ca>. All rights reserved.");
-__RCSID("$NetBSD: videoctl.c,v 1.1 2010/12/26 10:37:15 jmcneill Exp $");
+__RCSID("$NetBSD: videoctl.c,v 1.2 2011/09/16 15:39:30 joerg Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
@@ -47,7 +47,7 @@
#include <unistd.h>
#include <util.h>
-static void usage(void);
+__dead static void usage(void);
static void video_print(const char *);
static void video_print_all(void);
static bool video_print_caps(const char *);
Index: src/usr.bin/w/w.c
diff -u src/usr.bin/w/w.c:1.74 src/usr.bin/w/w.c:1.75
--- src/usr.bin/w/w.c:1.74 Tue Apr 14 07:37:31 2009
+++ src/usr.bin/w/w.c Fri Sep 16 15:39:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: w.c,v 1.74 2009/04/14 07:37:31 lukem Exp $ */
+/* $NetBSD: w.c,v 1.75 2011/09/16 15:39:30 joerg Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)w.c 8.6 (Berkeley) 6/30/94";
#else
-__RCSID("$NetBSD: w.c,v 1.74 2009/04/14 07:37:31 lukem Exp $");
+__RCSID("$NetBSD: w.c,v 1.75 2011/09/16 15:39:30 joerg Exp $");
#endif
#endif /* not lint */
@@ -124,9 +124,7 @@
static int ttystat(const char *, struct stat *);
static void process(struct entry *);
#endif
-static void usage(int);
-
-int main(int, char **);
+__dead static void usage(int);
int
main(int argc, char **argv)
Index: src/usr.bin/wc/wc.c
diff -u src/usr.bin/wc/wc.c:1.34 src/usr.bin/wc/wc.c:1.35
--- src/usr.bin/wc/wc.c:1.34 Fri Feb 19 11:15:23 2010
+++ src/usr.bin/wc/wc.c Fri Sep 16 15:39:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wc.c,v 1.34 2010/02/19 11:15:23 tron Exp $ */
+/* $NetBSD: wc.c,v 1.35 2011/09/16 15:39:30 joerg Exp $ */
/*
* Copyright (c) 1980, 1987, 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)wc.c 8.2 (Berkeley) 5/2/95";
#else
-__RCSID("$NetBSD: wc.c,v 1.34 2010/02/19 11:15:23 tron Exp $");
+__RCSID("$NetBSD: wc.c,v 1.35 2011/09/16 15:39:30 joerg Exp $");
#endif
#endif /* not lint */
@@ -79,10 +79,9 @@
static void cnt(const char *);
static void print_counts(wc_count_t, wc_count_t, wc_count_t, wc_count_t,
const char *);
-static void usage(void);
+__dead static void usage(void);
static size_t do_mb(wchar_t *, const char *, size_t, mbstate_t *,
size_t *, const char *);
-int main(int, char *[]);
int
main(int argc, char *argv[])
Index: src/usr.bin/xstr/xstr.c
diff -u src/usr.bin/xstr/xstr.c:1.24 src/usr.bin/xstr/xstr.c:1.25
--- src/usr.bin/xstr/xstr.c:1.24 Tue Nov 17 18:31:13 2009
+++ src/usr.bin/xstr/xstr.c Fri Sep 16 15:39:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xstr.c,v 1.24 2009/11/17 18:31:13 drochner Exp $ */
+/* $NetBSD: xstr.c,v 1.25 2011/09/16 15:39:31 joerg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)xstr.c 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: xstr.c,v 1.24 2009/11/17 18:31:13 drochner Exp $");
+__RCSID("$NetBSD: xstr.c,v 1.25 2011/09/16 15:39:31 joerg Exp $");
#endif
#endif /* not lint */
@@ -62,7 +62,7 @@
*/
static off_t hashit(const char *, int);
-static void onintr(int);
+__dead static void onintr(int);
static off_t yankstr(char **);
static int octdigit(char);
static void inithash(void);
@@ -75,7 +75,7 @@
static char lastchr(const char *);
static int istail(const char *, const char *);
static void process(const char *);
-static void usage(void);
+__dead static void usage(void);
static off_t tellpt;
static off_t mesgpt;
@@ -96,8 +96,6 @@
short hnew;
} bucket[BUCKETS];
-int main(int, char *[]);
-
int
main(int argc, char *argv[])
{
