diff options
| author | joerg <joerg@NetBSD.org> | 2011-09-16 15:39:25 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2011-09-16 15:39:25 +0000 |
| commit | 4624cd84611d94dca3296c36c8a168b4bcf4841d (patch) | |
| tree | c7252e56ce4b800d64c14143a987aae79662bd25 | |
| parent | 0bf8553d3c69575f5a2c8288661d1c1feccc5fd8 (diff) | |
Use __dead
57 files changed, 183 insertions, 207 deletions
diff --git a/distrib/utils/sysinst/aout2elf.c b/distrib/utils/sysinst/aout2elf.c index 3befc6b40fd..dfb224ebbb2 100644 --- a/distrib/utils/sysinst/aout2elf.c +++ b/distrib/utils/sysinst/aout2elf.c @@ -1,4 +1,4 @@ -/* $NetBSD: aout2elf.c,v 1.16 2011/04/04 08:30:12 mbalmer Exp $ +/* $NetBSD: aout2elf.c,v 1.17 2011/09/16 15:42:28 joerg Exp $ * * Copyright 1997 Piermont Information Systems Inc. * All rights reserved. @@ -192,7 +192,7 @@ endloop: return n; } -static void +__dead static void abort_libupdate(void) { msg_display(MSG_aoutfail); diff --git a/distrib/utils/sysinst/main.c b/distrib/utils/sysinst/main.c index ae3865f5fed..facfb1433df 100644 --- a/distrib/utils/sysinst/main.c +++ b/distrib/utils/sysinst/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.60 2011/05/30 14:20:48 joerg Exp $ */ +/* $NetBSD: main.c,v 1.61 2011/09/16 15:42:28 joerg Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -53,8 +53,8 @@ int main(int, char **); static void select_language(void); -static void usage(void); -static void miscsighandler(int); +__dead static void usage(void); +__dead static void miscsighandler(int); static void ttysighandler(int); static void cleanup(void); static void process_f_flag(char *); diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c index 7f2f788ce34..bc9d0ae4758 100644 --- a/usr.bin/dirname/dirname.c +++ b/usr.bin/dirname/dirname.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993, 1994\ #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 @@ __RCSID("$NetBSD: dirname.c,v 1.11 2008/07/21 14:19:22 lukem Exp $"); #include <stdlib.h> #include <unistd.h> -static void usage(void); +__dead static void usage(void); int main(int argc, char **argv) diff --git a/usr.bin/extattr/getextattr.c b/usr.bin/extattr/getextattr.c index 41af3260ce8..43b96ea2c7f 100644 --- a/usr.bin/extattr/getextattr.c +++ b/usr.bin/extattr/getextattr.c @@ -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) { diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c index 41426bdf848..49a3545c0b1 100644 --- a/usr.bin/find/main.c +++ b/usr.bin/find/main.c @@ -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 @@ static char sccsid[] = "@(#)main.c 8.4 (Berkeley) 5/4/95"; #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 issort; /* sort directory entries */ 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[]) diff --git a/usr.bin/fsplit/fsplit.c b/usr.bin/fsplit/fsplit.c index b9b3bb57a99..ce6cd93cd9a 100644 --- a/usr.bin/fsplit/fsplit.c +++ b/usr.bin/fsplit/fsplit.c @@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\ #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 x[] = "zzz000.f"; 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); diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c index caa0960b344..467d7e6a19c 100644 --- a/usr.bin/ftp/cmds.c +++ b/usr.bin/ftp/cmds.c @@ -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 struct types { 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 *); diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h index 30341fa66e7..bb71466133b 100644 --- a/usr.bin/ftp/extern.h +++ b/usr.bin/ftp/extern.h @@ -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 tm; 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 @@ void help(int, char **); 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 @@ void page(int, char **); 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 @@ int togglevar(int, char **, int *, const char *); 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); diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c index 67b2442452e..fc53e0a86c7 100644 --- a/usr.bin/ftp/fetch.c +++ b/usr.bin/ftp/fetch.c @@ -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 @@ typedef enum { 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 @@ fetch_url(const char *url, const char *proxyenv, char *proxyauth, char *wwwauth) /* * Abort a HTTP retrieval */ -void +static void aborthttp(int notused) { char msgbuf[100]; diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c index 8e62411b77c..35f068da00f 100644 --- a/usr.bin/ftp/ftp.c +++ b/usr.bin/ftp/ftp.c @@ -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 @@ int ptflag = 0; 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 @@ empty(FILE *ecin, FILE *din, int sec) sigjmp_buf xferabort; -void +__dead static void abortxfer(int notused) { char msgbuf[100]; @@ -1819,7 +1820,7 @@ pswitch(int flag) } } -void +__dead static void abortpt(int notused) { @@ -2031,7 +2032,7 @@ gunique(const char *local) * 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]; diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c index cbc7244103b..b3a14e44d86 100644 --- a/usr.bin/ftp/main.c +++ b/usr.bin/ftp/main.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 1989, 1993, 1994\ #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 @@ __RCSID("$NetBSD: main.c,v 1.118 2011/08/14 12:58:15 christos Exp $"); #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) diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c index 327c0757623..8bd3fdb8da2 100644 --- a/usr.bin/grep/grep.c +++ b/usr.bin/grep/grep.c @@ -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 @@ extern char *__progname; /* * Prints usage information and returns 2. */ -static void +__dead static void usage(void) { fprintf(stderr, getstr(4), __progname); diff --git a/usr.bin/iconv/iconv.c b/usr.bin/iconv/iconv.c index b1c41936277..e50c1742170 100644 --- a/usr.bin/iconv/iconv.c +++ b/usr.bin/iconv/iconv.c @@ -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 @@ __RCSID("$NetBSD: iconv.c,v 1.16 2009/02/20 15:28:21 yamt Exp $"); #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); diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index 597141bd93e..720cc495486 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -37,7 +37,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\ #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 @@ __RCSID("$NetBSD: id.c,v 1.31 2009/04/12 10:51:38 lukem Exp $"); 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 *); diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c index ef0ccfe083f..dd17a8ef5b2 100644 --- a/usr.bin/ktrace/ktrace.c +++ b/usr.bin/ktrace/ktrace.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\ #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 @@ __RCSID("$NetBSD: ktrace.c,v 1.44 2011/02/05 15:22:17 yamt Exp $"); #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); diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c index 796f88cbc62..f7234984ca2 100644 --- a/usr.bin/last/last.c +++ b/usr.bin/last/last.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994\ #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 long maxrec; /* records to display */ 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 wtmpx(const char *, int, int, int, int); 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) diff --git a/usr.bin/last/want.c b/usr.bin/last/want.c index 2abe1f2f4bc..5d566af90d9 100644 --- a/usr.bin/last/want.c +++ b/usr.bin/last/want.c @@ -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 @@ gethost(struct utmp *ut, const char *host, int numeric) * 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 */ diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c index a9834520ced..126abd8c84f 100644 --- a/usr.bin/leave/leave.c +++ b/usr.bin/leave/leave.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1988, 1993\ #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 @@ __RCSID("$NetBSD: leave.c,v 1.14 2008/07/21 14:19:23 lukem Exp $"); * 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) diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c index 2a495c387e0..8ee8b78a555 100644 --- a/usr.bin/mail/cmd1.c +++ b/usr.bin/mail/cmd1.c @@ -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 @@ type1_core(struct message *mp, void *v) static jmp_buf pipestop; /*ARGSUSED*/ -static void +__dead static void cmd1_brokpipe(int signo __unused) { diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c index 396d10bd254..9a5409d5f4a 100644 --- a/usr.bin/mail/collect.c +++ b/usr.bin/mail/collect.c @@ -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 @@ coll_int(int signo) } /*ARGSUSED*/ -static void +__dead static void coll_hup(int signo __unused) { diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c index ecadd01c169..3e06573c67e 100644 --- a/usr.bin/mail/lex.c +++ b/usr.bin/mail/lex.c @@ -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 @@ comment_char(char *line) static jmp_buf pipestop; /*ARGSUSED*/ -static void +__dead static void lex_brokpipe(int signo) { @@ -785,7 +785,7 @@ out: * 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 @@ lex_intr(int signo) * Branch here on hangup signal and simulate "exit". */ /*ARGSUSED*/ -static void +__dead static void lex_hangup(int s __unused) { diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c index 7de1ec1ab72..5eb95e0d769 100644 --- a/usr.bin/mail/tty.c +++ b/usr.bin/mail/tty.c @@ -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 @@ shextract(char *line, int ntype) } /*ARGSUSED*/ -static void +__dead static void tty_sigint(int signo __unused) { diff --git a/usr.bin/mkcsmapper/yacc.y b/usr.bin/mkcsmapper/yacc.y index d050438c7ff..0a2a497e24a 100644 --- a/usr.bin/mkcsmapper/yacc.y +++ b/usr.bin/mkcsmapper/yacc.y @@ -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 @@ do_mkpv(FILE *in) errx(EXIT_FAILURE, "%s\n", strerror(ret)); } -static void +__dead static void usage(void) { warnx("usage: \n" diff --git a/usr.bin/mkesdb/yacc.y b/usr.bin/mkesdb/yacc.y index 4d368750259..3634bf16a17 100644 --- a/usr.bin/mkesdb/yacc.y +++ b/usr.bin/mkesdb/yacc.y @@ -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 @@ do_mkdb(FILE *in) errx(EXIT_FAILURE, "%s\n", strerror(ret)); } -static void +__dead static void usage(void) { errx(EXIT_FAILURE, diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index 4425e014b20..afda5e03f57 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -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 @@ iftot_print_sum(struct iftot *cur, struct iftot *old) printf(" %5llu", (unsigned long long)(cur->ift_dr - old->ift_dr)); } -static void +__dead static void sidewaysintpr_sysctl(unsigned interval) { sigset_t emptyset; diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index bd6b5649f2e..6e5b52ac464 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\ #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 @@ const struct softintrq { 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); diff --git a/usr.bin/newgrp/newgrp.c b/usr.bin/newgrp/newgrp.c index 27b2335a463..61309c3fab6 100644 --- a/usr.bin/newgrp/newgrp.c +++ b/usr.bin/newgrp/newgrp.c @@ -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 @@ __RCSID("$NetBSD: newgrp.c,v 1.6 2008/04/28 20:24:14 martin Exp $"); #include "grutil.h" -static void +__dead static void usage(void) { (void)fprintf(stderr, "usage: %s [-l] [group]\n", getprogname()); diff --git a/usr.bin/passwd/extern.h b/usr.bin/passwd/extern.h index 11a4d746d5d..ffd0eaff7a9 100644 --- a/usr.bin/passwd/extern.h +++ b/usr.bin/passwd/extern.h @@ -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 *); diff --git a/usr.bin/passwd/yp_passwd.c b/usr.bin/passwd/yp_passwd.c index 0d11ff1a308..ecc96164d46 100644 --- a/usr.bin/passwd/yp_passwd.c +++ b/usr.bin/passwd/yp_passwd.c @@ -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 @@ __RCSID("$NetBSD: yp_passwd.c,v 1.35 2010/09/08 13:58:46 christos Exp $"); static uid_t uid; static char *domain; -static void +__dead static void pwerror(const char *name, int show_err, int eval) { diff --git a/usr.bin/pathchk/pathchk.c b/usr.bin/pathchk/pathchk.c index b3a75b75d7b..0f7f5c100f9 100644 --- a/usr.bin/pathchk/pathchk.c +++ b/usr.bin/pathchk/pathchk.c @@ -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 @@ __RCSID("$NetBSD: pathchk.c,v 1.1 2003/04/15 19:46:40 jdolecek Exp $"); 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 */ diff --git a/usr.bin/progress/progress.c b/usr.bin/progress/progress.c index 893e89cd042..5e4f8ee8185 100644 --- a/usr.bin/progress/progress.c +++ b/usr.bin/progress/progress.c @@ -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 @@ __RCSID("$NetBSD: progress.c,v 1.18 2010/07/17 10:51:03 tron Exp $"); #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) diff --git a/usr.bin/pwhash/pwhash.c b/usr.bin/pwhash/pwhash.c index 377b4fe4f76..de7d07d5efe 100644 --- a/usr.bin/pwhash/pwhash.c +++ b/usr.bin/pwhash/pwhash.c @@ -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 @@ __RCSID("$NetBSD: pwhash.c,v 1.14 2006/03/05 08:50:58 christos Exp $"); #define DO_BLF 3 #define DO_SHA1 4 -static void +__dead static void usage(void) { diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c index 4fe014515f4..6702a1e93a4 100644 --- a/usr.bin/rev/rev.c +++ b/usr.bin/rev/rev.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1992, 1993\ #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 @@ __RCSID("$NetBSD: rev.c,v 1.11 2009/07/21 01:25:14 ahoka Exp $"); #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[]) diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c index b16105c3680..8930ab4352a 100644 --- a/usr.bin/rpcinfo/rpcinfo.c +++ b/usr.bin/rpcinfo/rpcinfo.c @@ -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 @@ static void get_inet_address(struct sockaddr_in *, const char *); #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 *, diff --git a/usr.bin/rump_allserver/rump_allserver.c b/usr.bin/rump_allserver/rump_allserver.c index 539875e877c..239d61e26fc 100644 --- a/usr.bin/rump_allserver/rump_allserver.c +++ b/usr.bin/rump_allserver/rump_allserver.c @@ -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 @@ __RCSID("$NetBSD: rump_allserver.c,v 1.21 2011/02/22 15:51:59 pooka Exp $"); #include <unistd.h> #include <util.h> -static void +__dead static void usage(void) { @@ -58,7 +58,7 @@ usage(void) exit(1); } -static void +__dead static void die(int sflag, int error, const char *reason) { diff --git a/usr.bin/rump_dhcpclient/main.c b/usr.bin/rump_dhcpclient/main.c index c0d4b4e5e10..cf472c44722 100644 --- a/usr.bin/rump_dhcpclient/main.c +++ b/usr.bin/rump_dhcpclient/main.c @@ -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) { diff --git a/usr.bin/rump_halt/rump.halt.c b/usr.bin/rump_halt/rump.halt.c index f494a745ffc..bfeed3bbad4 100644 --- a/usr.bin/rump_halt/rump.halt.c +++ b/usr.bin/rump_halt/rump.halt.c @@ -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 @@ __RCSID("$NetBSD: rump.halt.c,v 1.2 2011/01/22 13:43:07 pooka Exp $"); #define ARGFLAGS "dhn" -static void +__dead static void usage(void) { diff --git a/usr.bin/sdpquery/sdpquery.c b/usr.bin/sdpquery/sdpquery.c index 967bcdedb4e..38c3150bf11 100644 --- a/usr.bin/sdpquery/sdpquery.c +++ b/usr.bin/sdpquery/sdpquery.c @@ -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 @@ __RCSID("$NetBSD: sdpquery.c,v 1.6 2011/08/14 13:27:47 christos Exp $"); #include "sdpquery.h" -static void usage(void); +__dead static void usage(void); const char *control_socket; diff --git a/usr.bin/shmif_dumpbus/shmif_dumpbus.c b/usr.bin/shmif_dumpbus/shmif_dumpbus.c index 3fad96bc19f..de1cee8dea5 100644 --- a/usr.bin/shmif_dumpbus/shmif_dumpbus.c +++ b/usr.bin/shmif_dumpbus/shmif_dumpbus.c @@ -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) { diff --git a/usr.bin/shuffle/shuffle.c b/usr.bin/shuffle/shuffle.c index d147b38aa42..d1fa8138ac8 100644 --- a/usr.bin/shuffle/shuffle.c +++ b/usr.bin/shuffle/shuffle.c @@ -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 @@ __RCSID("$NetBSD: shuffle.c,v 1.20 2009/04/13 07:31:36 lukem Exp $"); #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 diff --git a/usr.bin/skey/skey.c b/usr.bin/skey/skey.c index 611cdcc2d84..47b6e75e139 100644 --- a/usr.bin/skey/skey.c +++ b/usr.bin/skey/skey.c @@ -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 @@ __RCSID("$NetBSD: skey.c,v 1.17 2004/11/01 21:52:07 dsl Exp $"); #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 @@ main(int argc, char **argv) exit(0); } -void +static void usage(char *s) { diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c index 3e500fccb44..19159ea726e 100644 --- a/usr.bin/sort/sort.c +++ b/usr.bin/sort/sort.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1993\ 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 @@ const char *tmpdir; /* where temporary files should be put */ 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[]) diff --git a/usr.bin/sort/sort.h b/usr.bin/sort/sort.h index a9dbc48305a..677fd452265 100644 --- a/usr.bin/sort/sort.h +++ b/usr.bin/sort/sort.h @@ -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 makekey(FILE *, RECHEADER *, u_char *, struct field *); 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 *); diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index 0fdee9c710d..d8f6665c4f6 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994\ #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 int ifd = STDIN_FILENO, ofd = -1; /* Input/output file descriptors. */ 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); diff --git a/usr.bin/tabs/tabs.c b/usr.bin/tabs/tabs.c index 8f4de8c8bfa..33238ae9d89 100644 --- a/usr.bin/tabs/tabs.c +++ b/usr.bin/tabs/tabs.c @@ -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 struct tabspec tabspecs[] = { }; static const size_t ntabspecs = sizeof(tabspecs) / sizeof(tabspecs[0]); -static void +__dead static void usage(void) { fprintf(stderr, diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c index 426f21c5025..28c9c72abe1 100644 --- a/usr.bin/tftp/main.c +++ b/usr.bin/tftp/main.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\ #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 get __P((int, char **)); 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 settsize __P((int, char **)); 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)); diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c index f2b27005c3e..e516400ea98 100644 --- a/usr.bin/tftp/tftp.c +++ b/usr.bin/tftp/tftp.c @@ -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 int makerequest __P((int, const char *, struct tftphdr *, const char *, o 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 *)); diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c index 455382b86f4..9a9adf9dab9 100644 --- a/usr.bin/unifdef/unifdef.c +++ b/usr.bin/unifdef/unifdef.c @@ -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 @@ static const char copyright[] = #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 int exitstat; /* program exit status */ 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 ignoreoff(void); 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 @@ usage(void) 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); } diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c index d3c2813ae8c..679ea8ab4b2 100644 --- a/usr.bin/usbhidctl/usbhid.c +++ b/usr.bin/usbhidctl/usbhid.c @@ -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 @@ __RCSID("$NetBSD: usbhid.c,v 1.35 2009/04/14 06:14:10 lukem Exp $"); * 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 @@ varop_report(struct hid_item *item, struct Susbvar *var, 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 @@ devshow(int hidfd, report_desc_t rd, struct Susbvar *varlist, size_t vlsize, } } -static void +__dead static void usage(void) { const char *progname = getprogname(); diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c index a12b44f9b8d..c97f228fab2 100644 --- a/usr.bin/uuencode/uuencode.c +++ b/usr.bin/uuencode/uuencode.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\ #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 @@ __RCSID("$NetBSD: uuencode.c,v 1.14 2008/11/29 22:36:13 dholland Exp $"); #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[]) diff --git a/usr.bin/uuidgen/uuidgen.c b/usr.bin/uuidgen/uuidgen.c index 292008964a1..59aa7ae45dc 100644 --- a/usr.bin/uuidgen/uuidgen.c +++ b/usr.bin/uuidgen/uuidgen.c @@ -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 @@ __RCSID("$NetBSD: uuidgen.c,v 1.3 2008/04/28 20:24:15 martin Exp $"); #include <unistd.h> #include <uuid.h> -static void +__dead static void usage(void) { diff --git a/usr.bin/videoctl/videoctl.c b/usr.bin/videoctl/videoctl.c index ddecd509767..ec4cd803c68 100644 --- a/usr.bin/videoctl/videoctl.c +++ b/usr.bin/videoctl/videoctl.c @@ -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 <jmcneill@invisible.ca> @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __COPYRIGHT("@(#) Copyright (c) 2010\ Jared D. McNeill <jmcneill@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 @@ __RCSID("$NetBSD: videoctl.c,v 1.1 2010/12/26 10:37:15 jmcneill Exp $"); #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 *); diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index 3fa527edf2f..50ac9fbcf69 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1991, 1993, 1994\ #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 void pr_header(time_t *, int); 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) diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c index 642ba4afc13..602a4508da8 100644 --- a/usr.bin/wc/wc.c +++ b/usr.bin/wc/wc.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1987, 1991, 1993\ #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 int rval = 0; 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[]) diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c index 5a569613463..4b3ec764c2d 100644 --- a/usr.bin/xstr/xstr.c +++ b/usr.bin/xstr/xstr.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\ #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 @@ __RCSID("$NetBSD: xstr.c,v 1.24 2009/11/17 18:31:13 drochner Exp $"); */ 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 void xsdotc(void); 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 @@ static struct hash { short hnew; } bucket[BUCKETS]; -int main(int, char *[]); - int main(int argc, char *argv[]) { diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c index 7ad71e575cd..f5d430d1c38 100644 --- a/usr.sbin/faithd/faithd.c +++ b/usr.sbin/faithd/faithd.c @@ -1,4 +1,4 @@ -/* $NetBSD: faithd.c,v 1.34 2011/08/30 21:14:06 joerg Exp $ */ +/* $NetBSD: faithd.c,v 1.35 2011/09/16 15:39:37 joerg Exp $ */ /* $KAME: faithd.c,v 1.62 2003/08/19 21:20:33 itojun Exp $ */ /* @@ -96,7 +96,7 @@ static char *configfile = NULL; static int inetd_main(int, char **); static int daemon_main(int, char **); static void play_service(int) __dead; -static void play_child(int, struct sockaddr *); +static void play_child(int, struct sockaddr *) __dead; static int faith_prefix(struct sockaddr *); static int map6to4(struct sockaddr_in6 *, struct sockaddr_in *); static void sig_child(int); diff --git a/usr.sbin/faithd/faithd.h b/usr.sbin/faithd/faithd.h index a00bfed5125..ed304c33871 100644 --- a/usr.sbin/faithd/faithd.h +++ b/usr.sbin/faithd/faithd.h @@ -1,4 +1,4 @@ -/* $NetBSD: faithd.h,v 1.11 2011/08/30 21:14:06 joerg Exp $ */ +/* $NetBSD: faithd.h,v 1.12 2011/09/16 15:39:37 joerg Exp $ */ /* $KAME: faithd.h,v 1.9 2002/05/09 09:41:24 itojun Exp $ */ /* @@ -34,7 +34,7 @@ extern char logname[]; extern int dflag; extern void tcp_relay(int, int, const char *) __dead; -extern void ftp_relay(int, int); +extern void ftp_relay(int, int) __dead; extern int ftp_active(int, int, int *, int *); extern int ftp_passive(int, int, int *, int *); extern void exit_success(const char *, ...) __dead __printflike(1, 2); |
