diff --git a/bin/csh/exec.c b/bin/csh/exec.c index 8317f2917211..8322a62fe8d0 100644 --- a/bin/csh/exec.c +++ b/bin/csh/exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: exec.c,v 1.26 2007/07/16 18:26:10 christos Exp $ */ +/* $NetBSD: exec.c,v 1.27 2007/12/15 19:44:37 perry Exp $ */ /*- * Copyright (c) 1980, 1991, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95"; #else -__RCSID("$NetBSD: exec.c,v 1.26 2007/07/16 18:26:10 christos Exp $"); +__RCSID("$NetBSD: exec.c,v 1.27 2007/12/15 19:44:37 perry Exp $"); #endif #endif /* not lint */ @@ -97,7 +97,7 @@ static int hits, misses; /* Dummy search path for just absolute search when no path */ static Char *justabs[] = {STRNULL, 0}; -static void pexerr(void) __attribute__((noreturn)); +static void pexerr(void) __dead; static void texec(Char *, Char **); static int hashname(Char *); static int tellmewhat(struct wordent *, Char *); diff --git a/bin/sh/error.c b/bin/sh/error.c index 099e8caa8187..50e3df61bb80 100644 --- a/bin/sh/error.c +++ b/bin/sh/error.c @@ -1,4 +1,4 @@ -/* $NetBSD: error.c,v 1.33 2006/10/04 15:00:38 christos Exp $ */ +/* $NetBSD: error.c,v 1.34 2007/12/15 19:44:37 perry Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)error.c 8.2 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: error.c,v 1.33 2006/10/04 15:00:38 christos Exp $"); +__RCSID("$NetBSD: error.c,v 1.34 2007/12/15 19:44:37 perry Exp $"); #endif #endif /* not lint */ @@ -72,7 +72,7 @@ char *commandname; static void exverror(int, const char *, va_list) - __attribute__((__noreturn__)); + __dead; /* * Called to raise an exception. Since C doesn't include exceptions, we diff --git a/bin/sh/parser.c b/bin/sh/parser.c index 77001d335c20..51dda55790cf 100644 --- a/bin/sh/parser.c +++ b/bin/sh/parser.c @@ -1,4 +1,4 @@ -/* $NetBSD: parser.c,v 1.65 2007/06/07 20:57:59 dsl Exp $ */ +/* $NetBSD: parser.c,v 1.66 2007/12/15 19:44:37 perry Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95"; #else -__RCSID("$NetBSD: parser.c,v 1.65 2007/06/07 20:57:59 dsl Exp $"); +__RCSID("$NetBSD: parser.c,v 1.66 2007/12/15 19:44:37 perry Exp $"); #endif #endif /* not lint */ @@ -114,8 +114,8 @@ STATIC int readtoken(void); STATIC int xxreadtoken(void); STATIC int readtoken1(int, char const *, char *, int); STATIC int noexpand(char *); -STATIC void synexpect(int) __attribute__((__noreturn__)); -STATIC void synerror(const char *) __attribute__((__noreturn__)); +STATIC void synexpect(int) __dead; +STATIC void synerror(const char *) __dead; STATIC void setprompt(int); diff --git a/bin/test/test.c b/bin/test/test.c index 0bd456163dd4..9986f1fcd662 100644 --- a/bin/test/test.c +++ b/bin/test/test.c @@ -1,4 +1,4 @@ -/* $NetBSD: test.c,v 1.33 2007/06/24 18:54:58 christos Exp $ */ +/* $NetBSD: test.c,v 1.34 2007/12/15 19:44:38 perry Exp $ */ /* * test(1); version 7-like -- author Erik Baalbergen @@ -12,7 +12,7 @@ #include #ifndef lint -__RCSID("$NetBSD: test.c,v 1.33 2007/06/24 18:54:58 christos Exp $"); +__RCSID("$NetBSD: test.c,v 1.34 2007/12/15 19:44:38 perry Exp $"); #endif #include @@ -171,10 +171,10 @@ static int olderf(const char *, const char *); static int equalf(const char *, const char *); #if defined(SHELL) -extern void error(const char *, ...) __attribute__((__noreturn__)); +extern void error(const char *, ...) __dead; extern void *ckmalloc(size_t); #else -static void error(const char *, ...) __attribute__((__noreturn__)); +static void error(const char *, ...) __dead; static void error(const char *msg, ...) diff --git a/games/adventure/init.c b/games/adventure/init.c index 518770478f87..5269b96cdc8b 100644 --- a/games/adventure/init.c +++ b/games/adventure/init.c @@ -1,4 +1,4 @@ -/* $NetBSD: init.c,v 1.16 2006/03/18 05:16:46 rtr Exp $ */ +/* $NetBSD: init.c,v 1.17 2007/12/15 19:44:38 perry Exp $ */ /*- * Copyright (c) 1993 @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 6/2/93"; #else -__RCSID("$NetBSD: init.c,v 1.16 2006/03/18 05:16:46 rtr Exp $"); +__RCSID("$NetBSD: init.c,v 1.17 2007/12/15 19:44:38 perry Exp $"); #endif #endif /* not lint */ @@ -275,7 +275,7 @@ linkdata(void) /* come here if he hits a del */ void -trapdel(int n __attribute__((__unused__))) +trapdel(int n __unused) { delhit = 1; /* main checks, treats as QUIT */ signal(SIGINT, trapdel);/* catch subsequent DELs */ diff --git a/games/arithmetic/arithmetic.c b/games/arithmetic/arithmetic.c index 8eff98ee4401..7e6c22298588 100644 --- a/games/arithmetic/arithmetic.c +++ b/games/arithmetic/arithmetic.c @@ -1,4 +1,4 @@ -/* $NetBSD: arithmetic.c,v 1.21 2004/11/05 21:30:31 dsl Exp $ */ +/* $NetBSD: arithmetic.c,v 1.22 2007/12/15 19:44:38 perry Exp $ */ /* * Copyright (c) 1989, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)arithmetic.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: arithmetic.c,v 1.21 2004/11/05 21:30:31 dsl Exp $"); +__RCSID("$NetBSD: arithmetic.c,v 1.22 2007/12/15 19:44:38 perry Exp $"); #endif #endif /* not lint */ @@ -85,13 +85,13 @@ __RCSID("$NetBSD: arithmetic.c,v 1.21 2004/11/05 21:30:31 dsl Exp $"); #include int getrandom(int, int, int); -void intr(int) __attribute__((__noreturn__)); +void intr(int) __dead; int main(int, char *[]); int opnum(int); void penalise(int, int, int); int problem(void); void showstats(int); -void usage(void) __attribute__((__noreturn__)); +void usage(void) __dead; const char keylist[] = "+-x/"; const char defaultkeys[] = "+-"; @@ -159,7 +159,7 @@ main(argc, argv) /* Handle interrupt character. Print score and exit. */ void intr(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { showstats(1); exit(0); diff --git a/games/atc/graphics.c b/games/atc/graphics.c index 3e082ad2369d..9d9ba6fbdd24 100644 --- a/games/atc/graphics.c +++ b/games/atc/graphics.c @@ -1,4 +1,4 @@ -/* $NetBSD: graphics.c,v 1.13 2006/06/07 09:22:52 jnemeth Exp $ */ +/* $NetBSD: graphics.c,v 1.14 2007/12/15 19:44:38 perry Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)graphics.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: graphics.c,v 1.13 2006/06/07 09:22:52 jnemeth Exp $"); +__RCSID("$NetBSD: graphics.c,v 1.14 2007/12/15 19:44:38 perry Exp $"); #endif #endif /* not lint */ @@ -282,7 +282,7 @@ ioerror(int pos, int len, const char *str) /* ARGSUSED */ void -quit(int dummy __attribute__((__unused__))) +quit(int dummy __unused) { int c, y, x; #ifdef BSD diff --git a/games/atc/input.c b/games/atc/input.c index 44310133cded..215c3c3001e6 100644 --- a/games/atc/input.c +++ b/games/atc/input.c @@ -1,4 +1,4 @@ -/* $NetBSD: input.c,v 1.21 2006/10/07 18:29:02 elad Exp $ */ +/* $NetBSD: input.c,v 1.22 2007/12/15 19:44:38 perry Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)input.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: input.c,v 1.21 2006/10/07 18:29:02 elad Exp $"); +__RCSID("$NetBSD: input.c,v 1.22 2007/12/15 19:44:38 perry Exp $"); #endif #endif /* not lint */ @@ -371,7 +371,7 @@ setplane(int c) /* ARGSUSED */ const char * -turn(int c __attribute__((__unused__))) +turn(int c __unused) { if (p.altitude == 0) return ("Planes at airports may not change direction"); @@ -380,7 +380,7 @@ turn(int c __attribute__((__unused__))) /* ARGSUSED */ const char * -circle(int c __attribute__((__unused__))) +circle(int c __unused) { if (p.altitude == 0) return ("Planes cannot circle on the ground"); @@ -390,7 +390,7 @@ circle(int c __attribute__((__unused__))) /* ARGSUSED */ const char * -left(int c __attribute__((__unused__))) +left(int c __unused) { dir = D_LEFT; p.new_dir = p.dir - 1; @@ -401,7 +401,7 @@ left(int c __attribute__((__unused__))) /* ARGSUSED */ const char * -right(int c __attribute__((__unused__))) +right(int c __unused) { dir = D_RIGHT; p.new_dir = p.dir + 1; @@ -412,7 +412,7 @@ right(int c __attribute__((__unused__))) /* ARGSUSED */ const char * -Left(int c __attribute__((__unused__))) +Left(int c __unused) { p.new_dir = p.dir - 2; if (p.new_dir < 0) @@ -422,7 +422,7 @@ Left(int c __attribute__((__unused__))) /* ARGSUSED */ const char * -Right(int c __attribute__((__unused__))) +Right(int c __unused) { p.new_dir = p.dir + 2; if (p.new_dir >= MAXDIR) @@ -476,7 +476,7 @@ delayb(int c) /* ARGSUSED */ const char * -beacon(int c __attribute__((__unused__))) +beacon(int c __unused) { dest_type = T_BEACON; return (NULL); @@ -484,7 +484,7 @@ beacon(int c __attribute__((__unused__))) /* ARGSUSED */ const char * -ex_it(int c __attribute__((__unused__))) +ex_it(int c __unused) { dest_type = T_EXIT; return (NULL); @@ -492,7 +492,7 @@ ex_it(int c __attribute__((__unused__))) /* ARGSUSED */ const char * -airport(int c __attribute__((__unused__))) +airport(int c __unused) { dest_type = T_AIRPORT; return (NULL); @@ -500,7 +500,7 @@ airport(int c __attribute__((__unused__))) /* ARGSUSED */ const char * -climb(int c __attribute__((__unused__))) +climb(int c __unused) { dir = D_UP; return (NULL); @@ -508,7 +508,7 @@ climb(int c __attribute__((__unused__))) /* ARGSUSED */ const char * -descend(int c __attribute__((__unused__))) +descend(int c __unused) { dir = D_DOWN; return (NULL); @@ -620,7 +620,7 @@ rel_dir(int c) /* ARGSUSED */ const char * -mark(int c __attribute__((__unused__))) +mark(int c __unused) { if (p.altitude == 0) return ("Cannot mark planes on the ground"); @@ -632,7 +632,7 @@ mark(int c __attribute__((__unused__))) /* ARGSUSED */ const char * -unmark(int c __attribute__((__unused__))) +unmark(int c __unused) { if (p.altitude == 0) return ("Cannot unmark planes on the ground"); @@ -644,7 +644,7 @@ unmark(int c __attribute__((__unused__))) /* ARGSUSED */ const char * -ignore(int c __attribute__((__unused__))) +ignore(int c __unused) { if (p.altitude == 0) return ("Cannot ignore planes on the ground"); diff --git a/games/atc/log.c b/games/atc/log.c index ce437a5c215c..b333ce5fd4c7 100644 --- a/games/atc/log.c +++ b/games/atc/log.c @@ -1,4 +1,4 @@ -/* $NetBSD: log.c,v 1.18 2006/06/07 09:30:35 jnemeth Exp $ */ +/* $NetBSD: log.c,v 1.19 2007/12/15 19:44:38 perry Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)log.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: log.c,v 1.18 2006/06/07 09:30:35 jnemeth Exp $"); +__RCSID("$NetBSD: log.c,v 1.19 2007/12/15 19:44:38 perry Exp $"); #endif #endif /* not lint */ @@ -293,7 +293,7 @@ log_score(int list_em) /* ARGSUSED */ void -log_score_quit(int dummy __attribute__((__unused__))) +log_score_quit(int dummy __unused) { (void)log_score(0); exit(0); diff --git a/games/atc/update.c b/games/atc/update.c index 844051272104..9096993787ee 100644 --- a/games/atc/update.c +++ b/games/atc/update.c @@ -1,4 +1,4 @@ -/* $NetBSD: update.c,v 1.18 2006/11/24 21:14:55 wiz Exp $ */ +/* $NetBSD: update.c,v 1.19 2007/12/15 19:44:38 perry Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)update.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: update.c,v 1.18 2006/11/24 21:14:55 wiz Exp $"); +__RCSID("$NetBSD: update.c,v 1.19 2007/12/15 19:44:38 perry Exp $"); #endif #endif /* not lint */ @@ -54,7 +54,7 @@ __RCSID("$NetBSD: update.c,v 1.18 2006/11/24 21:14:55 wiz Exp $"); /* ARGSUSED */ void -update(int dummy __attribute__((__unused__))) +update(int dummy __unused) { int i, dir_diff, unclean; PLANE *pp, *p1, *p2; diff --git a/games/backgammon/backgammon/main.c b/games/backgammon/backgammon/main.c index 57c27874e5a2..dae7dae95c7e 100644 --- a/games/backgammon/backgammon/main.c +++ b/games/backgammon/backgammon/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.22 2005/07/01 01:12:39 jmc Exp $ */ +/* $NetBSD: main.c,v 1.23 2007/12/15 19:44:38 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: main.c,v 1.22 2005/07/01 01:12:39 jmc Exp $"); +__RCSID("$NetBSD: main.c,v 1.23 2007/12/15 19:44:38 perry Exp $"); #endif #endif /* not lint */ @@ -88,7 +88,7 @@ static const char password[] = "losfurng"; static char pbuf[10]; int -main(int argc __attribute__((__unused__)), char **argv) +main(int argc __unused, char **argv) { int i; /* non-descript index */ int l; /* non-descript index */ diff --git a/games/backgammon/common_source/subs.c b/games/backgammon/common_source/subs.c index a95e4813e3ee..62529fe08b00 100644 --- a/games/backgammon/common_source/subs.c +++ b/games/backgammon/common_source/subs.c @@ -1,4 +1,4 @@ -/* $NetBSD: subs.c,v 1.15 2005/07/01 01:12:39 jmc Exp $ */ +/* $NetBSD: subs.c,v 1.16 2007/12/15 19:44:39 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)subs.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: subs.c,v 1.15 2005/07/01 01:12:39 jmc Exp $"); +__RCSID("$NetBSD: subs.c,v 1.16 2007/12/15 19:44:39 perry Exp $"); #endif #endif /* not lint */ @@ -433,7 +433,7 @@ fixtty(struct termios *t) } void -getout(int dummy __attribute__((__unused__))) +getout(int dummy __unused) { /* go to bottom of screen */ if (tflag) { diff --git a/games/backgammon/teachgammon/teach.c b/games/backgammon/teachgammon/teach.c index 8f197176b9c6..5a39fb2fb9df 100644 --- a/games/backgammon/teachgammon/teach.c +++ b/games/backgammon/teachgammon/teach.c @@ -1,4 +1,4 @@ -/* $NetBSD: teach.c,v 1.17 2005/07/01 01:12:39 jmc Exp $ */ +/* $NetBSD: teach.c,v 1.18 2007/12/15 19:44:39 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)teach.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: teach.c,v 1.17 2005/07/01 01:12:39 jmc Exp $"); +__RCSID("$NetBSD: teach.c,v 1.18 2007/12/15 19:44:39 perry Exp $"); #endif #endif /* not lint */ @@ -60,7 +60,7 @@ const char *const contin[] = { }; int -main(int argc __attribute__((__unused__)), char *argv[]) +main(int argc __unused, char *argv[]) { int i; diff --git a/games/battlestar/command6.c b/games/battlestar/command6.c index c877c1f0fa6b..ef324c84d277 100644 --- a/games/battlestar/command6.c +++ b/games/battlestar/command6.c @@ -1,4 +1,4 @@ -/* $NetBSD: command6.c,v 1.3 2005/07/01 06:04:54 jmc Exp $ */ +/* $NetBSD: command6.c,v 1.4 2007/12/15 19:44:39 perry Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)com6.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: command6.c,v 1.3 2005/07/01 06:04:54 jmc Exp $"); +__RCSID("$NetBSD: command6.c,v 1.4 2007/12/15 19:44:39 perry Exp $"); #endif #endif /* not lint */ @@ -89,7 +89,7 @@ die(void) } void -diesig(int dummy __attribute__((__unused__))) +diesig(int dummy __unused) { die(); } diff --git a/games/battlestar/fly.c b/games/battlestar/fly.c index e2e298d36b9f..6affb9d6a335 100644 --- a/games/battlestar/fly.c +++ b/games/battlestar/fly.c @@ -1,4 +1,4 @@ -/* $NetBSD: fly.c,v 1.13 2005/07/01 06:04:54 jmc Exp $ */ +/* $NetBSD: fly.c,v 1.14 2007/12/15 19:44:39 perry Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)fly.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: fly.c,v 1.13 2005/07/01 06:04:54 jmc Exp $"); +__RCSID("$NetBSD: fly.c,v 1.14 2007/12/15 19:44:39 perry Exp $"); #endif #endif /* not lint */ @@ -61,7 +61,7 @@ static void succumb(int); static void target(void); static void -succumb(int dummy __attribute__((__unused__))) +succumb(int dummy __unused) { if (oldsig == SIG_DFL) { endfly(); @@ -247,7 +247,7 @@ blast(void) } static void -moveenemy(int dummy __attribute__((__unused__))) +moveenemy(int dummy __unused) { double d; int oldr, oldc; diff --git a/games/boggle/boggle/mach.c b/games/boggle/boggle/mach.c index b88a5b071fc0..e8a481c2fa25 100644 --- a/games/boggle/boggle/mach.c +++ b/games/boggle/boggle/mach.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach.c,v 1.16 2006/08/09 14:29:40 christos Exp $ */ +/* $NetBSD: mach.c,v 1.17 2007/12/15 19:44:39 perry Exp $ */ /*- * Copyright (c) 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)mach.c 8.1 (Berkeley) 6/11/93"; #else -__RCSID("$NetBSD: mach.c,v 1.16 2006/08/09 14:29:40 christos Exp $"); +__RCSID("$NetBSD: mach.c,v 1.17 2007/12/15 19:44:39 perry Exp $"); #endif #endif /* not lint */ @@ -577,7 +577,7 @@ tty_setup(void) } static void -stop_catcher(int signo __attribute__((__unused__))) +stop_catcher(int signo __unused) { sigset_t isigset, osigset; @@ -597,7 +597,7 @@ stop_catcher(int signo __attribute__((__unused__))) } static void -cont_catcher(int signo __attribute__((__unused__))) +cont_catcher(int signo __unused) { noecho(); raw(); @@ -612,7 +612,7 @@ cont_catcher(int signo __attribute__((__unused__))) * It would mean reformatting the entire display */ static void -winch_catcher(int signo __attribute__((__unused__))) +winch_catcher(int signo __unused) { struct winsize win; diff --git a/games/canfield/canfield/canfield.c b/games/canfield/canfield/canfield.c index e7fbefb96260..a16ce2e82b90 100644 --- a/games/canfield/canfield/canfield.c +++ b/games/canfield/canfield/canfield.c @@ -1,4 +1,4 @@ -/* $NetBSD: canfield.c,v 1.22 2006/02/25 02:06:08 wiz Exp $ */ +/* $NetBSD: canfield.c,v 1.23 2007/12/15 19:44:39 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)canfield.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: canfield.c,v 1.22 2006/02/25 02:06:08 wiz Exp $"); +__RCSID("$NetBSD: canfield.c,v 1.23 2007/12/15 19:44:39 perry Exp $"); #endif #endif /* not lint */ @@ -199,7 +199,7 @@ time_t acctstart; int dbfd = -1; void askquit(int); -void cleanup(int) __attribute__((__noreturn__)); +void cleanup(int) __dead; void cleanupboard(void); void clearabovemovebox(void); void clearbelowmovebox(void); @@ -1720,7 +1720,7 @@ finish(void) * procedure to clean up and exit */ void -cleanup(int dummy __attribute__((__unused__))) +cleanup(int dummy __unused) { total.thinktime += 1; @@ -1743,7 +1743,7 @@ cleanup(int dummy __attribute__((__unused__))) * Field an interrupt. */ void -askquit(int dummy __attribute__((__unused__))) +askquit(int dummy __unused) { move(msgrow, msgcol); printw("Really wish to quit? "); diff --git a/games/cribbage/io.c b/games/cribbage/io.c index 12e23b353624..ea2fedbaf131 100644 --- a/games/cribbage/io.c +++ b/games/cribbage/io.c @@ -1,4 +1,4 @@ -/* $NetBSD: io.c,v 1.20 2005/07/02 08:32:32 jmc Exp $ */ +/* $NetBSD: io.c,v 1.21 2007/12/15 19:44:39 perry Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: io.c,v 1.20 2005/07/02 08:32:32 jmc Exp $"); +__RCSID("$NetBSD: io.c,v 1.21 2007/12/15 19:44:39 perry Exp $"); #endif #endif /* not lint */ @@ -557,7 +557,7 @@ getline(void) } void -receive_intr(int signo __attribute__((__unused__))) +receive_intr(int signo __unused) { bye(); exit(1); diff --git a/games/cribbage/score.c b/games/cribbage/score.c index 4823980d5707..3c7b4a2671c2 100644 --- a/games/cribbage/score.c +++ b/games/cribbage/score.c @@ -1,4 +1,4 @@ -/* $NetBSD: score.c,v 1.12 2007/09/16 18:39:54 ragge Exp $ */ +/* $NetBSD: score.c,v 1.13 2007/12/15 19:44:39 perry Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)score.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: score.c,v 1.12 2007/09/16 18:39:54 ragge Exp $"); +__RCSID("$NetBSD: score.c,v 1.13 2007/12/15 19:44:39 perry Exp $"); #endif #endif /* not lint */ @@ -337,7 +337,7 @@ pegscore(CARD crd, const CARD tbl[], int n, int sum) * points such a crib will get. */ int -adjust(const CARD cb[], CARD tnv __attribute__((__unused__))) +adjust(const CARD cb[], CARD tnv __unused) { long scr; int i, c0, c1; diff --git a/games/dm/dm.c b/games/dm/dm.c index 5cae6605db71..2518c3690a22 100644 --- a/games/dm/dm.c +++ b/games/dm/dm.c @@ -1,4 +1,4 @@ -/* $NetBSD: dm.c,v 1.23 2006/05/25 07:11:54 dan Exp $ */ +/* $NetBSD: dm.c,v 1.24 2007/12/15 19:44:40 perry Exp $ */ /* * Copyright (c) 1987, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\ #if 0 static char sccsid[] = "@(#)dm.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dm.c,v 1.23 2006/05/25 07:11:54 dan Exp $"); +__RCSID("$NetBSD: dm.c,v 1.24 2007/12/15 19:44:40 perry Exp $"); #endif #endif /* not lint */ @@ -72,12 +72,12 @@ void c_tty(const char *); const char *hour(int); double load(void); void nogamefile(void); -void play(char **) __attribute__((__noreturn__)); +void play(char **) __dead; void read_config(void); int users(void); int -main(int argc __attribute__((__unused__)), char *argv[]) +main(int argc __unused, char *argv[]) { char *cp; diff --git a/games/factor/factor.c b/games/factor/factor.c index 05cd445d1bde..2f25d7718c4d 100644 --- a/games/factor/factor.c +++ b/games/factor/factor.c @@ -1,4 +1,4 @@ -/* $NetBSD: factor.c,v 1.16 2005/06/27 20:49:31 rillig Exp $ */ +/* $NetBSD: factor.c,v 1.17 2007/12/15 19:44:40 perry Exp $ */ /* * Copyright (c) 1989, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)factor.c 8.4 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: factor.c,v 1.16 2005/06/27 20:49:31 rillig Exp $"); +__RCSID("$NetBSD: factor.c,v 1.17 2007/12/15 19:44:40 perry Exp $"); #endif #endif /* not lint */ @@ -108,7 +108,7 @@ BN_CTX *ctx; /* just use a global context */ int main(int, char *[]); void pr_fact(BIGNUM *); /* print factors of a value */ void BN_print_dec_fp(FILE *, const BIGNUM *); -void usage(void) __attribute__((__noreturn__)); +void usage(void) __dead; #ifdef HAVE_OPENSSL void pollard_pminus1(BIGNUM *); /* print factors for big numbers */ #else diff --git a/games/fish/fish.c b/games/fish/fish.c index e6d6b5bddecd..a324504bea3a 100644 --- a/games/fish/fish.c +++ b/games/fish/fish.c @@ -1,4 +1,4 @@ -/* $NetBSD: fish.c,v 1.17 2005/07/02 08:38:24 jmc Exp $ */ +/* $NetBSD: fish.c,v 1.18 2007/12/15 19:44:40 perry Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\ #if 0 static char sccsid[] = "@(#)fish.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: fish.c,v 1.17 2005/07/02 08:38:24 jmc Exp $"); +__RCSID("$NetBSD: fish.c,v 1.18 2007/12/15 19:44:40 perry Exp $"); #endif #endif /* not lint */ @@ -91,7 +91,7 @@ int nrandom(int); void printhand(const int *); void printplayer(int); int promove(void); -void usage(void) __attribute__((__noreturn__)); +void usage(void) __dead; int usermove(void); int diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c index 3a56e9adf6d7..e7bb04c59e6b 100644 --- a/games/fortune/fortune/fortune.c +++ b/games/fortune/fortune/fortune.c @@ -1,4 +1,4 @@ -/* $NetBSD: fortune.c,v 1.49 2006/05/13 22:28:04 christos Exp $ */ +/* $NetBSD: fortune.c,v 1.50 2007/12/15 19:44:40 perry Exp $ */ /*- * Copyright (c) 1986, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1986, 1993\n\ #if 0 static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: fortune.c,v 1.49 2006/05/13 22:28:04 christos Exp $"); +__RCSID("$NetBSD: fortune.c,v 1.50 2007/12/15 19:44:40 perry Exp $"); #endif #endif /* not lint */ @@ -158,7 +158,7 @@ void print_file_list(void); void print_list(FILEDESC *, int); void sum_noprobs(FILEDESC *); void sum_tbl(STRFILE *, STRFILE *); -void usage(void) __attribute__((__noreturn__)); +void usage(void) __dead; void zero_tbl(STRFILE *); #ifndef NO_REGEX @@ -808,7 +808,7 @@ is_fortfile(file, datp, posp, check_for_offend) const char *file; char **datp, **posp # ifndef OK_TO_WRITE_DISK - __attribute__((__unused__)) + __unused # endif ; int check_for_offend; diff --git a/games/fortune/strfile/strfile.c b/games/fortune/strfile/strfile.c index a8bdedcdc348..e0dae6de528c 100644 --- a/games/fortune/strfile/strfile.c +++ b/games/fortune/strfile/strfile.c @@ -1,4 +1,4 @@ -/* $NetBSD: strfile.c,v 1.23 2005/04/19 20:16:19 rillig Exp $ */ +/* $NetBSD: strfile.c,v 1.24 2007/12/15 19:44:40 perry Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)strfile.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: strfile.c,v 1.23 2005/04/19 20:16:19 rillig Exp $"); +__RCSID("$NetBSD: strfile.c,v 1.24 2007/12/15 19:44:40 perry Exp $"); #endif #endif /* not lint */ #endif /* __NetBSD__ */ @@ -144,7 +144,7 @@ STRFILE Tbl; /* statistics table */ STR *Firstch; /* first chars of each string */ #ifdef __GNUC__ -#define NORETURN __attribute__((__noreturn__)) +#define NORETURN __dead #else #define NORETURN #endif diff --git a/games/fortune/unstr/unstr.c b/games/fortune/unstr/unstr.c index d5a4a0fef5c6..8d87d9f8127f 100644 --- a/games/fortune/unstr/unstr.c +++ b/games/fortune/unstr/unstr.c @@ -1,4 +1,4 @@ -/* $NetBSD: unstr.c,v 1.11 2004/02/08 22:23:50 jsm Exp $ */ +/* $NetBSD: unstr.c,v 1.12 2007/12/15 19:44:40 perry Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\ #if 0 static char sccsid[] = "@(#)unstr.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: unstr.c,v 1.11 2004/02/08 22:23:50 jsm Exp $"); +__RCSID("$NetBSD: unstr.c,v 1.12 2007/12/15 19:44:40 perry Exp $"); #endif #endif /* not lint */ @@ -86,7 +86,7 @@ void order_unstr(STRFILE *); /* ARGSUSED */ int main(ac, av) - int ac __attribute__((__unused__)); + int ac __unused; char **av; { static STRFILE tbl; /* description table */ diff --git a/games/gomoku/main.c b/games/gomoku/main.c index 6f01ed03c24b..e707e47ebfa0 100644 --- a/games/gomoku/main.c +++ b/games/gomoku/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.12 2004/01/27 20:30:29 jsm Exp $ */ +/* $NetBSD: main.c,v 1.13 2007/12/15 19:44:40 perry Exp $ */ /* * Copyright (c) 1994 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1994\n\ #if 0 static char sccsid[] = "@(#)main.c 8.4 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: main.c,v 1.12 2004/01/27 20:30:29 jsm Exp $"); +__RCSID("$NetBSD: main.c,v 1.13 2007/12/15 19:44:40 perry Exp $"); #endif #endif /* not lint */ @@ -532,7 +532,7 @@ quit() void quitsig(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { quit(); } diff --git a/games/gomoku/pickmove.c b/games/gomoku/pickmove.c index 4360143cf71f..98c8fa4c2042 100644 --- a/games/gomoku/pickmove.c +++ b/games/gomoku/pickmove.c @@ -1,4 +1,4 @@ -/* $NetBSD: pickmove.c,v 1.11 2004/01/27 20:26:20 jsm Exp $ */ +/* $NetBSD: pickmove.c,v 1.12 2007/12/15 19:44:40 perry Exp $ */ /* * Copyright (c) 1994 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)pickmove.c 8.2 (Berkeley) 5/3/95"; #else -__RCSID("$NetBSD: pickmove.c,v 1.11 2004/01/27 20:26:20 jsm Exp $"); +__RCSID("$NetBSD: pickmove.c,v 1.12 2007/12/15 19:44:40 perry Exp $"); #endif #endif /* not lint */ @@ -1050,7 +1050,7 @@ updatecombo(cbp, color) void appendcombo(cbp, color) struct combostr *cbp; - int color __attribute__((__unused__)); + int color __unused; { struct combostr *pcbp, *ncbp; diff --git a/games/hack/hack.apply.c b/games/hack/hack.apply.c index 391cbf413bd6..6c11950372d5 100644 --- a/games/hack/hack.apply.c +++ b/games/hack/hack.apply.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.apply.c,v 1.8 2004/01/27 20:30:29 jsm Exp $ */ +/* $NetBSD: hack.apply.c,v 1.9 2007/12/15 19:44:41 perry Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.apply.c,v 1.8 2004/01/27 20:30:29 jsm Exp $"); +__RCSID("$NetBSD: hack.apply.c,v 1.9 2007/12/15 19:44:41 perry Exp $"); #endif /* not lint */ #include "hack.h" @@ -137,7 +137,7 @@ xit: /* ARGSUSED */ static void use_camera(obj) /* */ - struct obj *obj __attribute__((__unused__)); + struct obj *obj __unused; { struct monst *mtmp; if (!getdir(1)) { /* ask: in what direction? */ @@ -303,7 +303,7 @@ bchit(ddx, ddy, range, sym) /* ARGSUSED */ static void use_whistle(obj) - struct obj *obj __attribute__((__unused__)); + struct obj *obj __unused; { struct monst *mtmp = fmon; pline("You produce a high whistling sound."); @@ -321,7 +321,7 @@ use_whistle(obj) /* ARGSUSED */ static void use_magic_whistle(obj) - struct obj *obj __attribute__((__unused__)); + struct obj *obj __unused; { struct monst *mtmp = fmon; pline("You produce a strange whistling sound."); diff --git a/games/hack/hack.end.c b/games/hack/hack.end.c index 51378bf90754..0b8a44bce729 100644 --- a/games/hack/hack.end.c +++ b/games/hack/hack.end.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.end.c,v 1.7 2006/05/13 22:45:11 christos Exp $ */ +/* $NetBSD: hack.end.c,v 1.8 2007/12/15 19:44:41 perry Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.end.c,v 1.7 2006/05/13 22:45:11 christos Exp $"); +__RCSID("$NetBSD: hack.end.c,v 1.8 2007/12/15 19:44:41 perry Exp $"); #endif /* not lint */ #include @@ -86,7 +86,7 @@ dodone() /*ARGSUSED*/ void done1(n) - int n __attribute__((__unused__)); + int n __unused; { (void) signal(SIGINT, SIG_IGN); pline("Really quit?"); @@ -108,7 +108,7 @@ int done_hup; /*ARGSUSED*/ void done_intr(n) - int n __attribute__((__unused__)); + int n __unused; { done_stopprint++; (void) signal(SIGINT, SIG_IGN); diff --git a/games/hack/hack.pager.c b/games/hack/hack.pager.c index 19063908b011..b52a64716eb9 100644 --- a/games/hack/hack.pager.c +++ b/games/hack/hack.pager.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.pager.c,v 1.10 2006/04/24 20:08:54 christos Exp $ */ +/* $NetBSD: hack.pager.c,v 1.11 2007/12/15 19:44:41 perry Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.pager.c,v 1.10 2006/04/24 20:08:54 christos Exp $"); +__RCSID("$NetBSD: hack.pager.c,v 1.11 2007/12/15 19:44:41 perry Exp $"); #endif /* not lint */ /* This file contains the command routine dowhatis() and a pager. */ @@ -131,7 +131,7 @@ static int got_intrup; void intruph(n) - int n __attribute__((__unused__)); + int n __unused; { got_intrup++; } diff --git a/games/hack/hack.rip.c b/games/hack/hack.rip.c index a29a3ea083d3..9e2ffb79b8dc 100644 --- a/games/hack/hack.rip.c +++ b/games/hack/hack.rip.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.rip.c,v 1.7 2003/04/02 18:36:39 jsm Exp $ */ +/* $NetBSD: hack.rip.c,v 1.8 2007/12/15 19:44:41 perry Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.rip.c,v 1.7 2003/04/02 18:36:39 jsm Exp $"); +__RCSID("$NetBSD: hack.rip.c,v 1.8 2007/12/15 19:44:41 perry Exp $"); #endif /* not lint */ #include "hack.h" @@ -126,7 +126,7 @@ outrip() void center(line, text) - int line __attribute__((__unused__)); + int line __unused; char *text; { int n = strlen(text) / 2; diff --git a/games/hack/hack.save.c b/games/hack/hack.save.c index fe116bcbab6c..75e5f7594151 100644 --- a/games/hack/hack.save.c +++ b/games/hack/hack.save.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.save.c,v 1.8 2003/04/02 18:36:40 jsm Exp $ */ +/* $NetBSD: hack.save.c,v 1.9 2007/12/15 19:44:41 perry Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.save.c,v 1.8 2003/04/02 18:36:40 jsm Exp $"); +__RCSID("$NetBSD: hack.save.c,v 1.9 2007/12/15 19:44:41 perry Exp $"); #endif /* not lint */ #include @@ -87,7 +87,7 @@ dosave() #ifndef NOSAVEONHANGUP void hangup(n) - int n __attribute__((__unused__)); + int n __unused; { (void) dosave0(1); exit(1); diff --git a/games/hangman/main.c b/games/hangman/main.c index a59e212d7ac5..9ac368b4ba20 100644 --- a/games/hangman/main.c +++ b/games/hangman/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.11 2003/08/07 09:37:22 agc Exp $ */ +/* $NetBSD: main.c,v 1.12 2007/12/15 19:44:41 perry Exp $ */ /* * Copyright (c) 1983, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\ #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: main.c,v 1.11 2003/08/07 09:37:22 agc Exp $"); +__RCSID("$NetBSD: main.c,v 1.12 2007/12/15 19:44:41 perry Exp $"); #endif #endif /* not lint */ @@ -92,7 +92,7 @@ main(argc, argv) */ void die(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { mvcur(0, COLS - 1, LINES - 1, 0); endwin(); diff --git a/games/hunt/hunt/hunt.c b/games/hunt/hunt/hunt.c index e9dd140830d8..dc06802f981a 100644 --- a/games/hunt/hunt/hunt.c +++ b/games/hunt/hunt/hunt.c @@ -1,4 +1,4 @@ -/* $NetBSD: hunt.c,v 1.24 2006/05/09 20:18:06 mrg Exp $ */ +/* $NetBSD: hunt.c,v 1.25 2007/12/15 19:44:41 perry Exp $ */ /* * Copyright (c) 1983-2003, Regents of the University of California. * All rights reserved. @@ -32,7 +32,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hunt.c,v 1.24 2006/05/09 20:18:06 mrg Exp $"); +__RCSID("$NetBSD: hunt.c,v 1.25 2007/12/15 19:44:41 perry Exp $"); #endif /* not lint */ # include @@ -111,8 +111,8 @@ extern int cur_row, cur_col; void dump_scores(SOCKET); long env_init(long); void fill_in_blanks(void); -void leave(int, char *) __attribute__((__noreturn__)); -void leavex(int, char *) __attribute__((__noreturn__)); +void leave(int, char *) __dead; +void leavex(int, char *) __dead; void fincurs(void); int main(int, char *[]); # ifdef INTERNET @@ -752,7 +752,7 @@ bad_ver() */ SIGNAL_TYPE sigterm(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { leavex(0, (char *) NULL); /* NOTREACHED */ @@ -765,7 +765,7 @@ sigterm(dummy) */ SIGNAL_TYPE sigusr1(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { leavex(1, "Unable to start driver. Try again."); /* NOTREACHED */ @@ -778,7 +778,7 @@ sigusr1(dummy) */ SIGNAL_TYPE sigalrm(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { return; } @@ -805,7 +805,7 @@ rmnl(s) */ SIGNAL_TYPE intr(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { int ch; int explained; diff --git a/games/hunt/hunt/otto.c b/games/hunt/hunt/otto.c index 3c0697131822..e83d7c860193 100644 --- a/games/hunt/hunt/otto.c +++ b/games/hunt/hunt/otto.c @@ -1,4 +1,4 @@ -/* $NetBSD: otto.c,v 1.10 2006/03/19 00:00:19 christos Exp $ */ +/* $NetBSD: otto.c,v 1.11 2007/12/15 19:44:41 perry Exp $ */ # ifdef OTTO /* * Copyright (c) 1983-2003, Regents of the University of California. @@ -45,7 +45,7 @@ #include #ifndef lint -__RCSID("$NetBSD: otto.c,v 1.10 2006/03/19 00:00:19 christos Exp $"); +__RCSID("$NetBSD: otto.c,v 1.11 2007/12/15 19:44:41 perry Exp $"); #endif /* not lint */ # include @@ -156,7 +156,7 @@ extern int Otto_count; STATIC SIGNAL_TYPE nothing(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { } diff --git a/games/hunt/huntd/faketalk.c b/games/hunt/huntd/faketalk.c index 593cb4a0e85d..9489b636e1e0 100644 --- a/games/hunt/huntd/faketalk.c +++ b/games/hunt/huntd/faketalk.c @@ -1,4 +1,4 @@ -/* $NetBSD: faketalk.c,v 1.10 2004/02/08 22:23:50 jsm Exp $ */ +/* $NetBSD: faketalk.c,v 1.11 2007/12/15 19:44:41 perry Exp $ */ /* * Copyright (c) 1983-2003, Regents of the University of California. * All rights reserved. @@ -32,7 +32,7 @@ #include #ifndef lint -__RCSID("$NetBSD: faketalk.c,v 1.10 2004/02/08 22:23:50 jsm Exp $"); +__RCSID("$NetBSD: faketalk.c,v 1.11 2007/12/15 19:44:41 perry Exp $"); #endif /* not lint */ #include "bsd.h" @@ -74,7 +74,7 @@ SIGNAL_TYPE exorcise(int); SIGNAL_TYPE exorcise(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { (void) wait(0); } diff --git a/games/mille/mille.c b/games/mille/mille.c index 320e0d1ee000..a8d01c1183bc 100644 --- a/games/mille/mille.c +++ b/games/mille/mille.c @@ -1,4 +1,4 @@ -/* $NetBSD: mille.c,v 1.13 2003/08/07 09:37:25 agc Exp $ */ +/* $NetBSD: mille.c,v 1.14 2007/12/15 19:44:41 perry Exp $ */ /* * Copyright (c) 1982, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1982, 1993\n\ #if 0 static char sccsid[] = "@(#)mille.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: mille.c,v 1.13 2003/08/07 09:37:25 agc Exp $"); +__RCSID("$NetBSD: mille.c,v 1.14 2007/12/15 19:44:41 perry Exp $"); #endif #endif /* not lint */ @@ -139,7 +139,7 @@ main(ac, av) */ void rub(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { (void)signal(SIGINT, SIG_IGN); if (getyn(REALLYPROMPT)) diff --git a/games/mille/print.c b/games/mille/print.c index f850371b2409..83be11b751ac 100644 --- a/games/mille/print.c +++ b/games/mille/print.c @@ -1,4 +1,4 @@ -/* $NetBSD: print.c,v 1.11 2003/08/07 09:37:26 agc Exp $ */ +/* $NetBSD: print.c,v 1.12 2007/12/15 19:44:42 perry Exp $ */ /* * Copyright (c) 1982, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: print.c,v 1.11 2003/08/07 09:37:26 agc Exp $"); +__RCSID("$NetBSD: print.c,v 1.12 2007/12/15 19:44:42 perry Exp $"); #endif #endif /* not lint */ @@ -121,7 +121,7 @@ prscore(for_real) #ifdef EXTRAP bool for_real; #else - bool for_real __attribute__((__unused__)); + bool for_real __unused; #endif { PLAY *pp; diff --git a/games/monop/monop.c b/games/monop/monop.c index 48cd7695444f..1653e1366b53 100644 --- a/games/monop/monop.c +++ b/games/monop/monop.c @@ -1,4 +1,4 @@ -/* $NetBSD: monop.c,v 1.15 2004/01/27 20:30:30 jsm Exp $ */ +/* $NetBSD: monop.c,v 1.16 2007/12/15 19:44:42 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)monop.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: monop.c,v 1.15 2004/01/27 20:30:30 jsm Exp $"); +__RCSID("$NetBSD: monop.c,v 1.16 2007/12/15 19:44:42 perry Exp $"); #endif #endif /* not lint */ @@ -93,7 +93,7 @@ main(ac, av) /*ARGSUSED*/ static void do_quit(n) - int n __attribute__((__unused__)); + int n __unused; { quit(); } diff --git a/games/number/number.c b/games/number/number.c index 954359fe9346..e66c92c13ff7 100644 --- a/games/number/number.c +++ b/games/number/number.c @@ -1,4 +1,4 @@ -/* $NetBSD: number.c,v 1.10 2004/11/05 21:30:32 dsl Exp $ */ +/* $NetBSD: number.c,v 1.11 2007/12/15 19:44:42 perry Exp $ */ /* * Copyright (c) 1988, 1993, 1994 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\n\ #if 0 static char sccsid[] = "@(#)number.c 8.3 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: number.c,v 1.10 2004/11/05 21:30:32 dsl Exp $"); +__RCSID("$NetBSD: number.c,v 1.11 2007/12/15 19:44:42 perry Exp $"); #endif #endif /* not lint */ @@ -81,7 +81,7 @@ int main(int, char *[]); int number(const char *, int); void pfract(int); int unit(int, const char *); -void usage(void) __attribute__((__noreturn__)); +void usage(void) __dead; int lflag; diff --git a/games/phantasia/io.c b/games/phantasia/io.c index ed6e0ad20d2a..9cff2e43124c 100644 --- a/games/phantasia/io.c +++ b/games/phantasia/io.c @@ -1,4 +1,4 @@ -/* $NetBSD: io.c,v 1.10 2007/12/15 16:32:05 perry Exp $ */ +/* $NetBSD: io.c,v 1.11 2007/12/15 19:44:42 perry Exp $ */ /* * io.c - input/output routines for Phantasia @@ -241,7 +241,7 @@ getanswer(choices, def) void catchalarm(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { longjmp(Timeoenv, 1); } diff --git a/games/phantasia/setup.c b/games/phantasia/setup.c index df1f01330192..70f3f6e39a70 100644 --- a/games/phantasia/setup.c +++ b/games/phantasia/setup.c @@ -1,4 +1,4 @@ -/* $NetBSD: setup.c,v 1.15 2007/12/15 16:32:05 perry Exp $ */ +/* $NetBSD: setup.c,v 1.16 2007/12/15 19:44:42 perry Exp $ */ /* * setup.c - set up all files for Phantasia @@ -10,7 +10,7 @@ #include "include.h" int main(int, char *[]); -void Error(const char *, const char *) __attribute__((__noreturn__)); +void Error(const char *, const char *) __dead; double drandom(void); /* */ diff --git a/games/pig/pig.c b/games/pig/pig.c index 3562097ef989..9dcae6cd2cbc 100644 --- a/games/pig/pig.c +++ b/games/pig/pig.c @@ -1,4 +1,4 @@ -/* $NetBSD: pig.c,v 1.11 2004/11/05 21:30:32 dsl Exp $ */ +/* $NetBSD: pig.c,v 1.12 2007/12/15 19:44:42 perry Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\ #if 0 static char sccsid[] = "@(#)pig.c 8.2 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: pig.c,v 1.11 2004/11/05 21:30:32 dsl Exp $"); +__RCSID("$NetBSD: pig.c,v 1.12 2007/12/15 19:44:42 perry Exp $"); #endif #endif /* not lint */ @@ -54,7 +54,7 @@ __RCSID("$NetBSD: pig.c,v 1.11 2004/11/05 21:30:32 dsl Exp $"); int main(int, char *[]); void pigout(char *, int); -void usage(void) __attribute__((__noreturn__)); +void usage(void) __dead; int main(argc, argv) diff --git a/games/pom/pom.c b/games/pom/pom.c index 3877058d17cf..c7c241767510 100644 --- a/games/pom/pom.c +++ b/games/pom/pom.c @@ -1,4 +1,4 @@ -/* $NetBSD: pom.c,v 1.15 2007/01/12 22:43:05 hubertf Exp $ */ +/* $NetBSD: pom.c,v 1.16 2007/12/15 19:44:42 perry Exp $ */ /* * Copyright (c) 1989, 1993 @@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)pom.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pom.c,v 1.15 2007/01/12 22:43:05 hubertf Exp $"); +__RCSID("$NetBSD: pom.c,v 1.16 2007/12/15 19:44:42 perry Exp $"); #endif #endif /* not lint */ @@ -89,7 +89,7 @@ double dtor(double); int main(int, char *[]); double potm(double); time_t parsetime(char *); -void badformat(void) __attribute__((__noreturn__)); +void badformat(void) __dead; int main(int argc, char *argv[]) diff --git a/games/primes/primes.c b/games/primes/primes.c index b77a737d63ba..95b90a6e2575 100644 --- a/games/primes/primes.c +++ b/games/primes/primes.c @@ -1,4 +1,4 @@ -/* $NetBSD: primes.c,v 1.12 2004/01/27 20:30:30 jsm Exp $ */ +/* $NetBSD: primes.c,v 1.13 2007/12/15 19:44:42 perry Exp $ */ /* * Copyright (c) 1989, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)primes.c 8.5 (Berkeley) 5/10/95"; #else -__RCSID("$NetBSD: primes.c,v 1.12 2004/01/27 20:30:30 jsm Exp $"); +__RCSID("$NetBSD: primes.c,v 1.13 2007/12/15 19:44:42 perry Exp $"); #endif #endif /* not lint */ @@ -106,7 +106,7 @@ extern const int pattern_size; /* length of pattern array */ int main(int, char *[]); void primes(ubig, ubig); ubig read_num_buf(void); -void usage(void) __attribute__((__noreturn__)); +void usage(void) __dead; int main(argc, argv) diff --git a/games/quiz/quiz.c b/games/quiz/quiz.c index be4de261bff3..1582ede766aa 100644 --- a/games/quiz/quiz.c +++ b/games/quiz/quiz.c @@ -1,4 +1,4 @@ -/* $NetBSD: quiz.c,v 1.21 2007/01/17 00:30:23 hubertf Exp $ */ +/* $NetBSD: quiz.c,v 1.22 2007/12/15 19:44:42 perry Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\ #if 0 static char sccsid[] = "@(#)quiz.c 8.3 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: quiz.c,v 1.21 2007/01/17 00:30:23 hubertf Exp $"); +__RCSID("$NetBSD: quiz.c,v 1.22 2007/12/15 19:44:42 perry Exp $"); #endif #endif /* not lint */ @@ -73,7 +73,7 @@ const char *next_cat(const char *); void quiz(void); void score(u_int, u_int, u_int); void show_index(void); -void usage(void) __attribute__((__noreturn__)); +void usage(void) __dead; int main(argc, argv) diff --git a/games/rain/rain.c b/games/rain/rain.c index 9be00376c310..31164882aa88 100644 --- a/games/rain/rain.c +++ b/games/rain/rain.c @@ -1,4 +1,4 @@ -/* $NetBSD: rain.c,v 1.18 2005/08/09 09:15:23 rpaulo Exp $ */ +/* $NetBSD: rain.c,v 1.19 2007/12/15 19:44:43 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)rain.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: rain.c,v 1.18 2005/08/09 09:15:23 rpaulo Exp $"); +__RCSID("$NetBSD: rain.c,v 1.19 2007/12/15 19:44:43 perry Exp $"); #endif #endif /* not lint */ @@ -146,7 +146,7 @@ main(int argc, char **argv) /* ARGSUSED */ static void -onsig(int dummy __attribute__((__unused__))) +onsig(int dummy __unused) { sig_caught = 1; } diff --git a/games/random/random.c b/games/random/random.c index 6b024f746842..27cdc98f51f9 100644 --- a/games/random/random.c +++ b/games/random/random.c @@ -1,4 +1,4 @@ -/* $NetBSD: random.c,v 1.10 2005/08/10 14:02:26 rpaulo Exp $ */ +/* $NetBSD: random.c,v 1.11 2007/12/15 19:44:43 perry Exp $ */ /* * Copyright (c) 1994 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1994\n\ #if 0 static char sccsid[] = "@(#)random.c 8.6 (Berkeley) 6/1/94"; #else -__RCSID("$NetBSD: random.c,v 1.10 2005/08/10 14:02:26 rpaulo Exp $"); +__RCSID("$NetBSD: random.c,v 1.11 2007/12/15 19:44:43 perry Exp $"); #endif #endif /* not lint */ @@ -60,7 +60,7 @@ __RCSID("$NetBSD: random.c,v 1.10 2005/08/10 14:02:26 rpaulo Exp $"); #define MAXRANDOM 2147483647 int main(int, char **); -void usage(void) __attribute__((__noreturn__)); +void usage(void) __dead; int main(argc, argv) diff --git a/games/robots/main.c b/games/robots/main.c index 85cbefd21a9c..584693e5abbb 100644 --- a/games/robots/main.c +++ b/games/robots/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.21 2004/11/05 21:30:32 dsl Exp $ */ +/* $NetBSD: main.c,v 1.22 2007/12/15 19:44:43 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: main.c,v 1.21 2004/11/05 21:30:32 dsl Exp $"); +__RCSID("$NetBSD: main.c,v 1.22 2007/12/15 19:44:43 perry Exp $"); #endif #endif /* not lint */ @@ -197,7 +197,7 @@ main(ac, av) */ void quit(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { endwin(); exit(0); diff --git a/games/rogue/init.c b/games/rogue/init.c index d077bf220570..e50769f54a27 100644 --- a/games/rogue/init.c +++ b/games/rogue/init.c @@ -1,4 +1,4 @@ -/* $NetBSD: init.c,v 1.13 2003/08/07 09:37:38 agc Exp $ */ +/* $NetBSD: init.c,v 1.14 2007/12/15 19:44:43 perry Exp $ */ /* * Copyright (c) 1988, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: init.c,v 1.13 2003/08/07 09:37:38 agc Exp $"); +__RCSID("$NetBSD: init.c,v 1.14 2007/12/15 19:44:43 perry Exp $"); #endif #endif /* not lint */ @@ -218,7 +218,7 @@ stop_window() void byebye(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { md_ignore_signals(); if (ask_quit) { @@ -231,7 +231,7 @@ byebye(dummy) void onintr(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { md_ignore_signals(); if (cant_int) { @@ -245,7 +245,7 @@ onintr(dummy) void error_save(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { save_is_interactive = 0; save_into_file(error_file); diff --git a/games/sail/pl_1.c b/games/sail/pl_1.c index f80f50242e08..5e2610568042 100644 --- a/games/sail/pl_1.c +++ b/games/sail/pl_1.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_1.c,v 1.18 2004/01/27 20:23:36 jsm Exp $ */ +/* $NetBSD: pl_1.c,v 1.19 2007/12/15 19:44:43 perry Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pl_1.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_1.c,v 1.18 2004/01/27 20:23:36 jsm Exp $"); +__RCSID("$NetBSD: pl_1.c,v 1.19 2007/12/15 19:44:43 perry Exp $"); #endif #endif /* not lint */ @@ -120,14 +120,14 @@ leave(int conditions) /*ARGSUSED*/ void -choke(int n __attribute__((__unused__))) +choke(int n __unused) { leave(LEAVE_QUIT); } /*ARGSUSED*/ void -child(int n __attribute__((__unused__))) +child(int n __unused) { int status; int pid; diff --git a/games/sail/pl_7.c b/games/sail/pl_7.c index 4a3bd62d9483..30bc28cba27f 100644 --- a/games/sail/pl_7.c +++ b/games/sail/pl_7.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_7.c,v 1.27 2003/08/07 09:37:44 agc Exp $ */ +/* $NetBSD: pl_7.c,v 1.28 2007/12/15 19:44:43 perry Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pl_7.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_7.c,v 1.27 2003/08/07 09:37:44 agc Exp $"); +__RCSID("$NetBSD: pl_7.c,v 1.28 2007/12/15 19:44:43 perry Exp $"); #endif #endif /* not lint */ @@ -114,7 +114,7 @@ cleanupscreen(void) /*ARGSUSED*/ void -newturn(int n __attribute__((__unused__))) +newturn(int n __unused) { repaired = loaded = fired = changed = 0; movebuf[0] = '\0'; diff --git a/games/snake/snake/snake.c b/games/snake/snake/snake.c index 31504fc4859b..2e1161a72912 100644 --- a/games/snake/snake/snake.c +++ b/games/snake/snake/snake.c @@ -1,4 +1,4 @@ -/* $NetBSD: snake.c,v 1.22 2007/01/17 00:30:23 hubertf Exp $ */ +/* $NetBSD: snake.c,v 1.23 2007/12/15 19:44:43 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)snake.c 8.2 (Berkeley) 1/7/94"; #else -__RCSID("$NetBSD: snake.c,v 1.22 2007/01/17 00:30:23 hubertf Exp $"); +__RCSID("$NetBSD: snake.c,v 1.23 2007/12/15 19:44:43 perry Exp $"); #endif #endif /* not lint */ @@ -122,7 +122,7 @@ void home(void); void length(int); void logit(const char *); int main(int, char **); -void mainloop(void) __attribute__((__noreturn__)); +void mainloop(void) __dead; struct point *point(struct point *, int, int); int post(int, int); int pushsnake(void); @@ -131,7 +131,7 @@ void setup(void); void snap(void); void snrand(struct point *); void spacewarp(int); -void stop(int) __attribute__((__noreturn__)); +void stop(int) __dead; int stretch(const struct point *); void surround(struct point *); void suspend(void); @@ -974,7 +974,7 @@ winnings(won) void stop(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { signal(SIGINT, SIG_IGN); endwin(); diff --git a/games/tetris/screen.c b/games/tetris/screen.c index 61519997f129..787a09ebba78 100644 --- a/games/tetris/screen.c +++ b/games/tetris/screen.c @@ -1,4 +1,4 @@ -/* $NetBSD: screen.c,v 1.20 2007/12/15 16:32:05 perry Exp $ */ +/* $NetBSD: screen.c,v 1.21 2007/12/15 19:44:43 perry Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -64,7 +64,7 @@ static struct termios oldtt; static void (*tstp)(int); static void scr_stop(int); -static void stopset(int) __attribute__((__noreturn__)); +static void stopset(int) __dead; /* diff --git a/games/tetris/tetris.c b/games/tetris/tetris.c index 3be171fd7ef2..c071fb5271cd 100644 --- a/games/tetris/tetris.c +++ b/games/tetris/tetris.c @@ -1,4 +1,4 @@ -/* $NetBSD: tetris.c,v 1.17 2004/01/27 20:30:30 jsm Exp $ */ +/* $NetBSD: tetris.c,v 1.18 2007/12/15 19:44:43 perry Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -77,8 +77,8 @@ int showpreview; static void elide(void); static void setup_board(void); int main(int, char **); - void onintr(int) __attribute__((__noreturn__)); - void usage(void) __attribute__((__noreturn__)); + void onintr(int) __dead; + void usage(void) __dead; /* * Set up the initial board. The bottom display row is completely set, @@ -322,7 +322,7 @@ main(argc, argv) void onintr(signo) - int signo __attribute__((__unused__)); + int signo __unused; { scr_clear(); scr_end(); diff --git a/games/trek/abandon.c b/games/trek/abandon.c index db79d0aadaa9..dc1be461fe18 100644 --- a/games/trek/abandon.c +++ b/games/trek/abandon.c @@ -1,4 +1,4 @@ -/* $NetBSD: abandon.c,v 1.6 2003/08/07 09:37:49 agc Exp $ */ +/* $NetBSD: abandon.c,v 1.7 2007/12/15 19:44:44 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)abandon.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: abandon.c,v 1.6 2003/08/07 09:37:49 agc Exp $"); +__RCSID("$NetBSD: abandon.c,v 1.7 2007/12/15 19:44:44 perry Exp $"); #endif #endif /* not lint */ @@ -69,7 +69,7 @@ __RCSID("$NetBSD: abandon.c,v 1.6 2003/08/07 09:37:49 agc Exp $"); /*ARGSUSED*/ void abandon(v) - int v __attribute__((__unused__)); + int v __unused; { struct quad *q; int i; diff --git a/games/trek/capture.c b/games/trek/capture.c index 700cb7d96221..b7fb0e7543de 100644 --- a/games/trek/capture.c +++ b/games/trek/capture.c @@ -1,4 +1,4 @@ -/* $NetBSD: capture.c,v 1.6 2003/08/07 09:37:50 agc Exp $ */ +/* $NetBSD: capture.c,v 1.7 2007/12/15 19:44:44 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)capture.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: capture.c,v 1.6 2003/08/07 09:37:50 agc Exp $"); +__RCSID("$NetBSD: capture.c,v 1.7 2007/12/15 19:44:44 perry Exp $"); #endif #endif /* not lint */ @@ -58,7 +58,7 @@ __RCSID("$NetBSD: capture.c,v 1.6 2003/08/07 09:37:50 agc Exp $"); /*ARGSUSED*/ void capture(v) - int v __attribute__((__unused__)); + int v __unused; { int i; struct kling *k; diff --git a/games/trek/cgetc.c b/games/trek/cgetc.c index d1c423d3b5b6..9490877ff345 100644 --- a/games/trek/cgetc.c +++ b/games/trek/cgetc.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgetc.c,v 1.6 2003/08/07 09:37:50 agc Exp $ */ +/* $NetBSD: cgetc.c,v 1.7 2007/12/15 19:44:44 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)cgetc.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: cgetc.c,v 1.6 2003/08/07 09:37:50 agc Exp $"); +__RCSID("$NetBSD: cgetc.c,v 1.7 2007/12/15 19:44:44 perry Exp $"); #endif #endif /* not lint */ @@ -42,7 +42,7 @@ __RCSID("$NetBSD: cgetc.c,v 1.6 2003/08/07 09:37:50 agc Exp $"); # include "trek.h" char cgetc(i) -int i __attribute__((__unused__)); +int i __unused; { return ( getchar() ); } diff --git a/games/trek/computer.c b/games/trek/computer.c index 57f4846702d0..a470cc479e04 100644 --- a/games/trek/computer.c +++ b/games/trek/computer.c @@ -1,4 +1,4 @@ -/* $NetBSD: computer.c,v 1.10 2004/01/27 20:30:30 jsm Exp $ */ +/* $NetBSD: computer.c,v 1.11 2007/12/15 19:44:44 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)computer.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: computer.c,v 1.10 2004/01/27 20:30:30 jsm Exp $"); +__RCSID("$NetBSD: computer.c,v 1.11 2007/12/15 19:44:44 perry Exp $"); #endif #endif /* not lint */ @@ -110,7 +110,7 @@ static void prkalc(int, double); /*ARGSUSED*/ void computer(v) - int v __attribute__((__unused__)); + int v __unused; { int ix, iy; int i, j; diff --git a/games/trek/dcrept.c b/games/trek/dcrept.c index b57120cdc1d6..d6bbd85218f3 100644 --- a/games/trek/dcrept.c +++ b/games/trek/dcrept.c @@ -1,4 +1,4 @@ -/* $NetBSD: dcrept.c,v 1.6 2003/08/07 09:37:50 agc Exp $ */ +/* $NetBSD: dcrept.c,v 1.7 2007/12/15 19:44:44 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dcrept.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dcrept.c,v 1.6 2003/08/07 09:37:50 agc Exp $"); +__RCSID("$NetBSD: dcrept.c,v 1.7 2007/12/15 19:44:44 perry Exp $"); #endif #endif /* not lint */ @@ -56,7 +56,7 @@ __RCSID("$NetBSD: dcrept.c,v 1.6 2003/08/07 09:37:50 agc Exp $"); /*ARGSUSED*/ void dcrept(v) - int v __attribute__((__unused__)); + int v __unused; { int i, f; double x; diff --git a/games/trek/destruct.c b/games/trek/destruct.c index fdf3dadad329..6f22517b1722 100644 --- a/games/trek/destruct.c +++ b/games/trek/destruct.c @@ -1,4 +1,4 @@ -/* $NetBSD: destruct.c,v 1.7 2003/08/07 09:37:50 agc Exp $ */ +/* $NetBSD: destruct.c,v 1.8 2007/12/15 19:44:44 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)destruct.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: destruct.c,v 1.7 2003/08/07 09:37:50 agc Exp $"); +__RCSID("$NetBSD: destruct.c,v 1.8 2007/12/15 19:44:44 perry Exp $"); #endif #endif /* not lint */ @@ -67,7 +67,7 @@ __RCSID("$NetBSD: destruct.c,v 1.7 2003/08/07 09:37:50 agc Exp $"); /*ARGSUSED*/ void destruct(v) - int v __attribute__((__unused__)); + int v __unused; { char checkpass[15]; int i, j; diff --git a/games/trek/dock.c b/games/trek/dock.c index 9a373a7fcb43..b9ba43e18869 100644 --- a/games/trek/dock.c +++ b/games/trek/dock.c @@ -1,4 +1,4 @@ -/* $NetBSD: dock.c,v 1.6 2003/08/07 09:37:50 agc Exp $ */ +/* $NetBSD: dock.c,v 1.7 2007/12/15 19:44:44 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dock.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dock.c,v 1.6 2003/08/07 09:37:50 agc Exp $"); +__RCSID("$NetBSD: dock.c,v 1.7 2007/12/15 19:44:44 perry Exp $"); #endif #endif /* not lint */ @@ -59,7 +59,7 @@ __RCSID("$NetBSD: dock.c,v 1.6 2003/08/07 09:37:50 agc Exp $"); /*ARGSUSED*/ void dock(v) - int v __attribute__((__unused__)); + int v __unused; { int i, j; int ok; @@ -133,7 +133,7 @@ dock(v) /*ARGSUSED*/ void undock(v) - int v __attribute__((__unused__)); + int v __unused; { struct event *e; int i; diff --git a/games/trek/dumpgame.c b/games/trek/dumpgame.c index e9c2012044fb..83c5e6ffa853 100644 --- a/games/trek/dumpgame.c +++ b/games/trek/dumpgame.c @@ -1,4 +1,4 @@ -/* $NetBSD: dumpgame.c,v 1.10 2006/03/19 01:00:35 christos Exp $ */ +/* $NetBSD: dumpgame.c,v 1.11 2007/12/15 19:44:44 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dumpgame.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dumpgame.c,v 1.10 2006/03/19 01:00:35 christos Exp $"); +__RCSID("$NetBSD: dumpgame.c,v 1.11 2007/12/15 19:44:44 perry Exp $"); #endif #endif /* not lint */ @@ -83,7 +83,7 @@ struct dump Dump_template[] = /*ARGSUSED*/ void dumpgame(v) - int v __attribute__((__unused__)); + int v __unused; { int version; int fd; diff --git a/games/trek/help.c b/games/trek/help.c index d4c6c42e3dba..b1150e3a4d28 100644 --- a/games/trek/help.c +++ b/games/trek/help.c @@ -1,4 +1,4 @@ -/* $NetBSD: help.c,v 1.7 2003/08/07 09:37:52 agc Exp $ */ +/* $NetBSD: help.c,v 1.8 2007/12/15 19:44:44 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)help.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: help.c,v 1.7 2003/08/07 09:37:52 agc Exp $"); +__RCSID("$NetBSD: help.c,v 1.8 2007/12/15 19:44:44 perry Exp $"); #endif #endif /* not lint */ @@ -69,7 +69,7 @@ const char *const Cntvect[3] = /*ARGSUSED*/ void help(v) - int v __attribute__((__unused__)); + int v __unused; { int i; double dist, x; diff --git a/games/trek/impulse.c b/games/trek/impulse.c index 230397784370..50ceeca86771 100644 --- a/games/trek/impulse.c +++ b/games/trek/impulse.c @@ -1,4 +1,4 @@ -/* $NetBSD: impulse.c,v 1.6 2003/08/07 09:37:52 agc Exp $ */ +/* $NetBSD: impulse.c,v 1.7 2007/12/15 19:44:44 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)impulse.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: impulse.c,v 1.6 2003/08/07 09:37:52 agc Exp $"); +__RCSID("$NetBSD: impulse.c,v 1.7 2007/12/15 19:44:44 perry Exp $"); #endif #endif /* not lint */ @@ -49,7 +49,7 @@ __RCSID("$NetBSD: impulse.c,v 1.6 2003/08/07 09:37:52 agc Exp $"); /*ARGSUSED*/ void impulse(v) - int v __attribute__((__unused__)); + int v __unused; { int course; int power; diff --git a/games/trek/lrscan.c b/games/trek/lrscan.c index 0cc004591c42..3e18baeb3d7c 100644 --- a/games/trek/lrscan.c +++ b/games/trek/lrscan.c @@ -1,4 +1,4 @@ -/* $NetBSD: lrscan.c,v 1.6 2003/08/07 09:37:52 agc Exp $ */ +/* $NetBSD: lrscan.c,v 1.7 2007/12/15 19:44:44 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)lrscan.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: lrscan.c,v 1.6 2003/08/07 09:37:52 agc Exp $"); +__RCSID("$NetBSD: lrscan.c,v 1.7 2007/12/15 19:44:44 perry Exp $"); #endif #endif /* not lint */ @@ -56,7 +56,7 @@ __RCSID("$NetBSD: lrscan.c,v 1.6 2003/08/07 09:37:52 agc Exp $"); /*ARGSUSED*/ void lrscan(v) - int v __attribute__((__unused__)); + int v __unused; { int i, j; struct quad *q; diff --git a/games/trek/phaser.c b/games/trek/phaser.c index e4f6dc3ddde4..4fbd784ec4b9 100644 --- a/games/trek/phaser.c +++ b/games/trek/phaser.c @@ -1,4 +1,4 @@ -/* $NetBSD: phaser.c,v 1.9 2003/08/07 09:37:53 agc Exp $ */ +/* $NetBSD: phaser.c,v 1.10 2007/12/15 19:44:44 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)phaser.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: phaser.c,v 1.9 2003/08/07 09:37:53 agc Exp $"); +__RCSID("$NetBSD: phaser.c,v 1.10 2007/12/15 19:44:44 perry Exp $"); #endif #endif /* not lint */ @@ -95,7 +95,7 @@ struct banks /*ARGSUSED*/ void phaser(v) - int v __attribute__((__unused__)); + int v __unused; { int i; int j; diff --git a/games/trek/play.c b/games/trek/play.c index a4dd6ebccdc2..ad9cf92787b5 100644 --- a/games/trek/play.c +++ b/games/trek/play.c @@ -1,4 +1,4 @@ -/* $NetBSD: play.c,v 1.8 2003/08/07 09:37:53 agc Exp $ */ +/* $NetBSD: play.c,v 1.9 2007/12/15 19:44:45 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)play.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: play.c,v 1.8 2003/08/07 09:37:53 agc Exp $"); +__RCSID("$NetBSD: play.c,v 1.9 2007/12/15 19:44:45 perry Exp $"); #endif #endif /* not lint */ @@ -87,7 +87,7 @@ const struct cvntab Comtab[] = /*ARGSUSED*/ void myreset(v) - int v __attribute__((__unused__)); + int v __unused; { longjmp(env, 1); diff --git a/games/trek/rest.c b/games/trek/rest.c index 2077de8072bb..d4478c6f661c 100644 --- a/games/trek/rest.c +++ b/games/trek/rest.c @@ -1,4 +1,4 @@ -/* $NetBSD: rest.c,v 1.6 2003/08/07 09:37:53 agc Exp $ */ +/* $NetBSD: rest.c,v 1.7 2007/12/15 19:44:45 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)rest.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: rest.c,v 1.6 2003/08/07 09:37:53 agc Exp $"); +__RCSID("$NetBSD: rest.c,v 1.7 2007/12/15 19:44:45 perry Exp $"); #endif #endif /* not lint */ @@ -59,7 +59,7 @@ __RCSID("$NetBSD: rest.c,v 1.6 2003/08/07 09:37:53 agc Exp $"); /*ARGSUSED*/ void rest(v) - int v __attribute__((__unused__)); + int v __unused; { double t; int percent; diff --git a/games/trek/setwarp.c b/games/trek/setwarp.c index 449d65fb49ea..17f874501350 100644 --- a/games/trek/setwarp.c +++ b/games/trek/setwarp.c @@ -1,4 +1,4 @@ -/* $NetBSD: setwarp.c,v 1.6 2003/08/07 09:37:54 agc Exp $ */ +/* $NetBSD: setwarp.c,v 1.7 2007/12/15 19:44:45 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)setwarp.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: setwarp.c,v 1.6 2003/08/07 09:37:54 agc Exp $"); +__RCSID("$NetBSD: setwarp.c,v 1.7 2007/12/15 19:44:45 perry Exp $"); #endif #endif /* not lint */ @@ -52,7 +52,7 @@ __RCSID("$NetBSD: setwarp.c,v 1.6 2003/08/07 09:37:54 agc Exp $"); /*ARGSUSED*/ void setwarp(v) - int v __attribute__((__unused__)); + int v __unused; { double warpfac; diff --git a/games/trek/torped.c b/games/trek/torped.c index 893a706a5298..a0e6be7b2b32 100644 --- a/games/trek/torped.c +++ b/games/trek/torped.c @@ -1,4 +1,4 @@ -/* $NetBSD: torped.c,v 1.8 2004/01/27 20:30:31 jsm Exp $ */ +/* $NetBSD: torped.c,v 1.9 2007/12/15 19:44:45 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)torped.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: torped.c,v 1.8 2004/01/27 20:30:31 jsm Exp $"); +__RCSID("$NetBSD: torped.c,v 1.9 2007/12/15 19:44:45 perry Exp $"); #endif #endif /* not lint */ @@ -68,7 +68,7 @@ static int randcourse(int); /*ARGSUSED*/ void torped(v) - int v __attribute__((__unused__)); + int v __unused; { int ix, iy; double x, y, dx, dy; diff --git a/games/trek/visual.c b/games/trek/visual.c index 03f621f0bb8a..4137ec6150b9 100644 --- a/games/trek/visual.c +++ b/games/trek/visual.c @@ -1,4 +1,4 @@ -/* $NetBSD: visual.c,v 1.6 2003/08/07 09:37:55 agc Exp $ */ +/* $NetBSD: visual.c,v 1.7 2007/12/15 19:44:45 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)visual.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: visual.c,v 1.6 2003/08/07 09:37:55 agc Exp $"); +__RCSID("$NetBSD: visual.c,v 1.7 2007/12/15 19:44:45 perry Exp $"); #endif #endif /* not lint */ @@ -70,7 +70,7 @@ struct xy Visdelta[11] = /*ARGSUSED*/ void visual(z) - int z __attribute__((__unused__)); + int z __unused; { int ix, iy; int co; diff --git a/games/worm/worm.c b/games/worm/worm.c index f0656c3c3042..f678e3710dea 100644 --- a/games/worm/worm.c +++ b/games/worm/worm.c @@ -1,4 +1,4 @@ -/* $NetBSD: worm.c,v 1.25 2004/01/27 20:30:31 jsm Exp $ */ +/* $NetBSD: worm.c,v 1.26 2007/12/15 19:44:45 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)worm.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: worm.c,v 1.25 2004/01/27 20:30:31 jsm Exp $"); +__RCSID("$NetBSD: worm.c,v 1.26 2007/12/15 19:44:45 perry Exp $"); #endif #endif /* not lint */ @@ -80,10 +80,10 @@ int visible_len; int lastch; char outbuf[BUFSIZ]; -void crash(void) __attribute__((__noreturn__)); +void crash(void) __dead; void display(const struct body *, char); int main(int, char **); -void leave(int) __attribute__((__noreturn__)); +void leave(int) __dead; void life(void); void newpos(struct body *); void process(int); @@ -213,7 +213,7 @@ leave(dummy) void wake(dummy) - int dummy __attribute__((__unused__)); + int dummy __unused; { signal(SIGALRM, wake); fflush(stdout); diff --git a/games/worms/worms.c b/games/worms/worms.c index 88fc47a5a1ac..bf0c97017ca0 100644 --- a/games/worms/worms.c +++ b/games/worms/worms.c @@ -1,4 +1,4 @@ -/* $NetBSD: worms.c,v 1.16 2004/09/12 04:51:32 christos Exp $ */ +/* $NetBSD: worms.c,v 1.17 2007/12/15 19:44:45 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)worms.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: worms.c,v 1.16 2004/09/12 04:51:32 christos Exp $"); +__RCSID("$NetBSD: worms.c,v 1.17 2007/12/15 19:44:45 perry Exp $"); #endif #endif /* not lint */ @@ -180,7 +180,7 @@ static struct worm { volatile sig_atomic_t sig_caught = 0; int main(int, char **); -void nomem(void) __attribute__((__noreturn__)); +void nomem(void) __dead; void onsig(int); int @@ -340,7 +340,7 @@ main(argc, argv) void onsig(signo) - int signo __attribute__((__unused__)); + int signo __unused; { sig_caught = 1; } diff --git a/games/wump/wump.c b/games/wump/wump.c index 1cff6dbc4699..dc2254aba060 100644 --- a/games/wump/wump.c +++ b/games/wump/wump.c @@ -1,4 +1,4 @@ -/* $NetBSD: wump.c,v 1.20 2006/01/19 21:20:35 garbled Exp $ */ +/* $NetBSD: wump.c,v 1.21 2007/12/15 19:44:45 perry Exp $ */ /* * Copyright (c) 1989, 1993 @@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)wump.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: wump.c,v 1.20 2006/01/19 21:20:35 garbled Exp $"); +__RCSID("$NetBSD: wump.c,v 1.21 2007/12/15 19:44:45 perry Exp $"); #endif #endif /* not lint */ @@ -133,7 +133,7 @@ void pit_survive(void); int shoot(char *); void shoot_self(void); int take_action(void); -void usage(void) __attribute__((__noreturn__)); +void usage(void) __dead; void wump_kill(void); int wump_nearby(void); diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c index 29cf9819fc99..fb2ab0b026ff 100644 --- a/libexec/atrun/atrun.c +++ b/libexec/atrun/atrun.c @@ -1,4 +1,4 @@ -/* $NetBSD: atrun.c,v 1.17 2007/12/15 16:32:05 perry Exp $ */ +/* $NetBSD: atrun.c,v 1.18 2007/12/15 19:44:45 perry Exp $ */ /* * atrun.c - run jobs queued by at; run with root privileges. @@ -59,14 +59,14 @@ #if 0 static char rcsid[] = "$OpenBSD: atrun.c,v 1.7 1997/09/08 22:12:10 millert Exp $"; #else -__RCSID("$NetBSD: atrun.c,v 1.17 2007/12/15 16:32:05 perry Exp $"); +__RCSID("$NetBSD: atrun.c,v 1.18 2007/12/15 19:44:45 perry Exp $"); #endif static int debug = 0; /* Local functions */ -static void perr(const char *, ...) __attribute__((__noreturn__)); -static void perrx(const char *, ...) __attribute__((__noreturn__)); +static void perr(const char *, ...) __dead; +static void perrx(const char *, ...) __dead; static int write_string(int, const char *); static void run_file(const char *, uid_t, gid_t); static void become_user(struct passwd *, uid_t); diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c index 15d60659ff87..4faefe99bb03 100644 --- a/libexec/rexecd/rexecd.c +++ b/libexec/rexecd/rexecd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rexecd.c,v 1.24 2006/05/11 00:22:52 mrg Exp $ */ +/* $NetBSD: rexecd.c,v 1.25 2007/12/15 19:44:46 perry Exp $ */ /* * Copyright (c) 1983, 1993 @@ -36,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\ #if 0 static char sccsid[] = "from: @(#)rexecd.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: rexecd.c,v 1.24 2006/05/11 00:22:52 mrg Exp $"); +__RCSID("$NetBSD: rexecd.c,v 1.25 2007/12/15 19:44:46 perry Exp $"); #endif #endif /* not lint */ @@ -69,9 +69,9 @@ __RCSID("$NetBSD: rexecd.c,v 1.24 2006/05/11 00:22:52 mrg Exp $"); int main(int, char *[]); static void rexecd_errx(int, const char *, ...) __attribute__((__noreturn__, __format__(__printf__, 2, 3))); -static void doit(struct sockaddr *) __attribute__((__noreturn__)); +static void doit(struct sockaddr *) __dead; static void getstr(char *, int, const char *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; #ifdef USE_PAM static pam_handle_t *pamh; diff --git a/libexec/rexecd/unit-tests/rexec.c b/libexec/rexecd/unit-tests/rexec.c index d354cf32345c..36e8f5c583e3 100644 --- a/libexec/rexecd/unit-tests/rexec.c +++ b/libexec/rexecd/unit-tests/rexec.c @@ -1,4 +1,4 @@ -/* $NetBSD: rexec.c,v 1.2 2005/02/27 01:34:07 christos Exp $ */ +/* $NetBSD: rexec.c,v 1.3 2007/12/15 19:44:46 perry Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__RCSID("$NetBSD: rexec.c,v 1.2 2005/02/27 01:34:07 christos Exp $"); +__RCSID("$NetBSD: rexec.c,v 1.3 2007/12/15 19:44:46 perry Exp $"); #include #include @@ -44,7 +44,7 @@ __RCSID("$NetBSD: rexec.c,v 1.2 2005/02/27 01:34:07 christos Exp $"); #include #include -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; /*XXX*/ int rexec(char **, int, char *, char *, char *, int *); diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c index 1a6076fd4f35..3c70797e04b1 100644 --- a/libexec/rpc.rusersd/rusersd.c +++ b/libexec/rpc.rusersd/rusersd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rusersd.c,v 1.16 2006/05/09 20:18:07 mrg Exp $ */ +/* $NetBSD: rusersd.c,v 1.17 2007/12/15 19:44:46 perry Exp $ */ /*- * Copyright (c) 1993 John Brezak @@ -30,7 +30,7 @@ #include #ifndef lint -__RCSID("$NetBSD: rusersd.c,v 1.16 2006/05/09 20:18:07 mrg Exp $"); +__RCSID("$NetBSD: rusersd.c,v 1.17 2007/12/15 19:44:46 perry Exp $"); #endif /* not lint */ #include @@ -47,7 +47,7 @@ __RCSID("$NetBSD: rusersd.c,v 1.16 2006/05/09 20:18:07 mrg Exp $"); int from_inetd = 1; -static void cleanup(int) __attribute__((__noreturn__)); +static void cleanup(int) __dead; static void /*ARGSUSED*/ diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c index 7655f2d06d23..a26165d9cb28 100644 --- a/libexec/rshd/rshd.c +++ b/libexec/rshd/rshd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rshd.c,v 1.44 2006/05/09 20:18:07 mrg Exp $ */ +/* $NetBSD: rshd.c,v 1.45 2007/12/15 19:44:46 perry Exp $ */ /* * Copyright (C) 1998 WIDE Project. @@ -69,7 +69,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1992, 1993, 1994\n\ #if 0 static char sccsid[] = "@(#)rshd.c 8.2 (Berkeley) 4/6/94"; #else -__RCSID("$NetBSD: rshd.c,v 1.44 2006/05/09 20:18:07 mrg Exp $"); +__RCSID("$NetBSD: rshd.c,v 1.45 2007/12/15 19:44:46 perry Exp $"); #endif #endif /* not lint */ @@ -137,7 +137,7 @@ int check_all; int log_success; /* If TRUE, log all successful accesses */ int sent_null; -void doit(struct sockaddr *) __attribute__((__noreturn__)); +void doit(struct sockaddr *) __dead; void rshd_errx(int, const char *, ...) __attribute__((__noreturn__, __format__(__printf__, 2, 3))); void getstr(char *, int, const char *); diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c index 898a8ec04322..f26f8720a890 100644 --- a/sbin/mount_msdos/mount_msdos.c +++ b/sbin/mount_msdos/mount_msdos.c @@ -1,4 +1,4 @@ -/* $NetBSD: mount_msdos.c,v 1.43 2007/07/16 17:06:53 pooka Exp $ */ +/* $NetBSD: mount_msdos.c,v 1.44 2007/12/15 19:44:46 perry Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou @@ -36,7 +36,7 @@ #include #ifndef lint -__RCSID("$NetBSD: mount_msdos.c,v 1.43 2007/07/16 17:06:53 pooka Exp $"); +__RCSID("$NetBSD: mount_msdos.c,v 1.44 2007/12/15 19:44:46 perry Exp $"); #endif /* not lint */ #include @@ -66,7 +66,7 @@ static const struct mntopt mopts[] = { }; int mount_msdos(int argc, char **argv); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; #ifndef MOUNT_NOMAIN int diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c index 706aaf67459a..277bc791cf8c 100644 --- a/sbin/mount_ntfs/mount_ntfs.c +++ b/sbin/mount_ntfs/mount_ntfs.c @@ -1,4 +1,4 @@ -/* $NetBSD: mount_ntfs.c,v 1.19 2007/07/16 17:06:53 pooka Exp $ */ +/* $NetBSD: mount_ntfs.c,v 1.20 2007/12/15 19:44:46 perry Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou @@ -35,7 +35,7 @@ #include #ifndef lint -__RCSID("$NetBSD: mount_ntfs.c,v 1.19 2007/07/16 17:06:53 pooka Exp $"); +__RCSID("$NetBSD: mount_ntfs.c,v 1.20 2007/12/15 19:44:46 perry Exp $"); #endif #include @@ -61,7 +61,7 @@ static const struct mntopt mopts[] = { MOPT_NULL, }; -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int mount_ntfs(int argc, char **argv); #ifndef MOUNT_NOMAIN diff --git a/sbin/mount_tmpfs/mount_tmpfs.c b/sbin/mount_tmpfs/mount_tmpfs.c index 1a58496e2790..aace8d7a0d17 100644 --- a/sbin/mount_tmpfs/mount_tmpfs.c +++ b/sbin/mount_tmpfs/mount_tmpfs.c @@ -1,4 +1,4 @@ -/* $NetBSD: mount_tmpfs.c,v 1.19 2007/12/14 17:37:22 christos Exp $ */ +/* $NetBSD: mount_tmpfs.c,v 1.20 2007/12/15 19:44:46 perry Exp $ */ /* * Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ #include #ifndef lint -__RCSID("$NetBSD: mount_tmpfs.c,v 1.19 2007/12/14 17:37:22 christos Exp $"); +__RCSID("$NetBSD: mount_tmpfs.c,v 1.20 2007/12/15 19:44:46 perry Exp $"); #endif /* not lint */ #include @@ -71,7 +71,7 @@ static const struct mntopt mopts[] = { /* --------------------------------------------------------------------- */ static int mount_tmpfs(int argc, char **argv); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; /* --------------------------------------------------------------------- */ diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c index 51f998765048..d3e6994c9fe9 100644 --- a/sbin/mount_udf/mount_udf.c +++ b/sbin/mount_udf/mount_udf.c @@ -1,4 +1,4 @@ -/* $NetBSD: mount_udf.c,v 1.10 2007/07/14 15:57:27 dsl Exp $ */ +/* $NetBSD: mount_udf.c,v 1.11 2007/12/15 19:44:46 perry Exp $ */ /* * Copyright (c) 2006 Reinoud Zandijk @@ -36,7 +36,7 @@ #include #ifndef lint -__RCSID("$NetBSD: mount_udf.c,v 1.10 2007/07/14 15:57:27 dsl Exp $"); +__RCSID("$NetBSD: mount_udf.c,v 1.11 2007/12/15 19:44:46 perry Exp $"); #endif /* not lint */ @@ -76,7 +76,7 @@ static const struct mntopt mopts[] = { /* prototypes */ int mount_udf(int argc, char **argv); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; /* code */ diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index e3c39f516273..30233a46e4f5 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -1,4 +1,4 @@ -/* $NetBSD: newfs.c,v 1.99 2007/07/16 17:06:55 pooka Exp $ */ +/* $NetBSD: newfs.c,v 1.100 2007/12/15 19:44:47 perry Exp $ */ /* * Copyright (c) 1983, 1989, 1993, 1994 @@ -78,7 +78,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993, 1994\n\ #if 0 static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95"; #else -__RCSID("$NetBSD: newfs.c,v 1.99 2007/07/16 17:06:55 pooka Exp $"); +__RCSID("$NetBSD: newfs.c,v 1.100 2007/12/15 19:44:47 perry Exp $"); #endif #endif /* not lint */ @@ -133,7 +133,7 @@ struct mntopt mopts[] = { static gid_t mfs_group(const char *); static uid_t mfs_user(const char *); static int64_t strsuftoi64(const char *, const char *, int64_t, int64_t, int *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; #define COMPAT /* allow non-labeled disks */ diff --git a/sbin/newfs_ext2fs/newfs_ext2fs.c b/sbin/newfs_ext2fs/newfs_ext2fs.c index bd4fb6133fb4..d99414537695 100644 --- a/sbin/newfs_ext2fs/newfs_ext2fs.c +++ b/sbin/newfs_ext2fs/newfs_ext2fs.c @@ -1,4 +1,4 @@ -/* $NetBSD: newfs_ext2fs.c,v 1.2 2007/12/14 13:19:35 tsutsui Exp $ */ +/* $NetBSD: newfs_ext2fs.c,v 1.3 2007/12/15 19:44:47 perry Exp $ */ /* * Copyright (c) 1983, 1989, 1993, 1994 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993, 1994\n\ #if 0 static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95"; #else -__RCSID("$NetBSD: newfs_ext2fs.c,v 1.2 2007/12/14 13:19:35 tsutsui Exp $"); +__RCSID("$NetBSD: newfs_ext2fs.c,v 1.3 2007/12/15 19:44:47 perry Exp $"); #endif #endif /* not lint */ @@ -71,7 +71,7 @@ __RCSID("$NetBSD: newfs_ext2fs.c,v 1.2 2007/12/14 13:19:35 tsutsui Exp $"); #include "partutil.h" static int64_t strsuftoi64(const char *, const char *, int64_t, int64_t, int *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; /* * For file systems smaller than SMALL_FSSIZE we use the S_DFL_* defaults, diff --git a/sbin/resize_ffs/resize_ffs.c b/sbin/resize_ffs/resize_ffs.c index e475d9ee8293..86ef26b64c3f 100644 --- a/sbin/resize_ffs/resize_ffs.c +++ b/sbin/resize_ffs/resize_ffs.c @@ -1,4 +1,4 @@ -/* $NetBSD: resize_ffs.c,v 1.11 2007/12/15 16:32:06 perry Exp $ */ +/* $NetBSD: resize_ffs.c,v 1.12 2007/12/15 19:44:47 perry Exp $ */ /* From sources sent on February 17, 2003 */ /*- * As its sole author, I explicitly place this code in the public @@ -62,7 +62,7 @@ ( (__GNUC__ == 2) && \ defined(__GNUC_MINOR__) && \ (__GNUC_MINOR__ >= 7) ) ) -#define UNUSED_ARG(x) x __attribute__((__unused__)) +#define UNUSED_ARG(x) x __unused #define INLINE inline #else #define UNUSED_ARG(x) x diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c index 0252c5a705ef..c3afefa8e301 100644 --- a/sbin/routed/rtquery/rtquery.c +++ b/sbin/routed/rtquery/rtquery.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtquery.c,v 1.19 2007/09/16 18:42:02 ragge Exp $ */ +/* $NetBSD: rtquery.c,v 1.20 2007/12/15 19:44:47 perry Exp $ */ /*- * Copyright (c) 1982, 1986, 1993 @@ -53,7 +53,7 @@ #include #endif -#define UNUSED __attribute__((unused)) +#define UNUSED __unused #ifndef __RCSID #define __RCSID(_s) static const char rcsid[] UNUSED = _s #endif @@ -64,7 +64,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\n" "The Regents of the University of California." " All rights reserved.\n"); #ifdef __NetBSD__ -__RCSID("$NetBSD: rtquery.c,v 1.19 2007/09/16 18:42:02 ragge Exp $"); +__RCSID("$NetBSD: rtquery.c,v 1.20 2007/12/15 19:44:47 perry Exp $"); #elif defined(__FreeBSD__) __RCSID("$FreeBSD$"); #else @@ -128,8 +128,8 @@ static char *default_argv[] = {localhost_str, 0}; static void rip_input(struct sockaddr_in*, int); static int out(const char *); -static void trace_loop(char *argv[]) __attribute__((__noreturn__)); -static void query_loop(char *argv[], int) __attribute__((__noreturn__)); +static void trace_loop(char *argv[]) __dead; +static void query_loop(char *argv[], int) __dead; static int getnet(char *, struct netinfo *); static u_int std_mask(u_int); static int parse_quote(char **, const char *, char *, char *, int); diff --git a/sbin/scan_ffs/scan_ffs.c b/sbin/scan_ffs/scan_ffs.c index b77159df85fa..2aabf69512a4 100644 --- a/sbin/scan_ffs/scan_ffs.c +++ b/sbin/scan_ffs/scan_ffs.c @@ -1,4 +1,4 @@ -/* $NetBSD: scan_ffs.c,v 1.19 2007/10/06 07:21:02 xtraeme Exp $ */ +/* $NetBSD: scan_ffs.c,v 1.20 2007/12/15 19:44:47 perry Exp $ */ /* * Copyright (c) 2005-2007 Juan Romero Pardines @@ -33,7 +33,7 @@ #include #ifndef lint -__RCSID("$NetBSD: scan_ffs.c,v 1.19 2007/10/06 07:21:02 xtraeme Exp $"); +__RCSID("$NetBSD: scan_ffs.c,v 1.20 2007/12/15 19:44:47 perry Exp $"); #endif /* not lint */ #include @@ -144,7 +144,7 @@ static int ffs_checkver(struct sblockinfo *); static void lfs_printpart(struct sblockinfo *, int, int); static void lfs_scan(struct sblockinfo *, int); /* common functions */ -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static int scan_disk(int, daddr_t, daddr_t, int); static int diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c index 88254d97fa47..ea1e82290555 100644 --- a/sbin/shutdown/shutdown.c +++ b/sbin/shutdown/shutdown.c @@ -1,4 +1,4 @@ -/* $NetBSD: shutdown.c,v 1.48 2007/07/10 23:50:35 jnemeth Exp $ */ +/* $NetBSD: shutdown.c,v 1.49 2007/12/15 19:44:47 perry Exp $ */ /* * Copyright (c) 1988, 1990, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1990, 1993\n\ #if 0 static char sccsid[] = "@(#)shutdown.c 8.4 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: shutdown.c,v 1.48 2007/07/10 23:50:35 jnemeth Exp $"); +__RCSID("$NetBSD: shutdown.c,v 1.49 2007/12/15 19:44:47 perry Exp $"); #endif #endif /* not lint */ @@ -95,17 +95,17 @@ static const char *whom; static char mbuf[BUFSIZ]; static char *bootstr; -static void badtime(void) __attribute__((__noreturn__)); -static void die_you_gravy_sucking_pig_dog(void) __attribute__((__noreturn__)); +static void badtime(void) __dead; +static void die_you_gravy_sucking_pig_dog(void) __dead; static void doitfast(void); void dorcshutdown(void); -static void finish(int) __attribute__((__noreturn__)); +static void finish(int) __dead; static void getoffset(char *); static void loop(void); static void nolog(void); static void timeout(int); static void timewarn(time_t); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(int argc, char *argv[]) diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c index 9dae78ab9f67..1f5936a87573 100644 --- a/sbin/umount/umount.c +++ b/sbin/umount/umount.c @@ -1,4 +1,4 @@ -/* $NetBSD: umount.c,v 1.40 2007/07/17 20:17:52 christos Exp $ */ +/* $NetBSD: umount.c,v 1.41 2007/12/15 19:44:48 perry Exp $ */ /*- * Copyright (c) 1980, 1989, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)umount.c 8.8 (Berkeley) 5/8/95"; #else -__RCSID("$NetBSD: umount.c,v 1.40 2007/07/17 20:17:52 christos Exp $"); +__RCSID("$NetBSD: umount.c,v 1.41 2007/12/15 19:44:48 perry Exp $"); #endif #endif /* not lint */ @@ -81,7 +81,7 @@ static int xdr_dir(XDR *, char *); static int fflag; static char *getmntname(const char *, mntwhat, char **); static int umountfs(const char *, const char **, int); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(int argc, char *argv[]) diff --git a/sbin/wsconsctl/wsconsctl.c b/sbin/wsconsctl/wsconsctl.c index b936e09f3de0..554ce3eba67d 100644 --- a/sbin/wsconsctl/wsconsctl.c +++ b/sbin/wsconsctl/wsconsctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsconsctl.c,v 1.15 2007/12/15 16:32:06 perry Exp $ */ +/* $NetBSD: wsconsctl.c,v 1.16 2007/12/15 19:44:48 perry Exp $ */ /*- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ extern int keyboard_field_tab_len; extern int mouse_field_tab_len; extern int display_field_tab_len; -static void usage(const char *) __attribute__((__noreturn__)); +static void usage(const char *) __dead; static void usage(const char *msg) diff --git a/usr.bin/audio/play/play.c b/usr.bin/audio/play/play.c index 99d7bf407d83..e842215ea8c8 100644 --- a/usr.bin/audio/play/play.c +++ b/usr.bin/audio/play/play.c @@ -1,4 +1,4 @@ -/* $NetBSD: play.c,v 1.47 2007/10/05 07:27:41 lukem Exp $ */ +/* $NetBSD: play.c,v 1.48 2007/12/15 19:44:48 perry Exp $ */ /* * Copyright (c) 1999 Matthew R. Green @@ -30,7 +30,7 @@ #include #ifndef lint -__RCSID("$NetBSD: play.c,v 1.47 2007/10/05 07:27:41 lukem Exp $"); +__RCSID("$NetBSD: play.c,v 1.48 2007/12/15 19:44:48 perry Exp $"); #endif @@ -58,7 +58,7 @@ void usage(void); void play(char *); void play_fd(const char *, int); ssize_t audioctl_write_fromhdr(void *, size_t, int, size_t *, const char *); -void cleanup(int) __attribute__((__noreturn__)); +void cleanup(int) __dead; audio_info_t info; int volume; diff --git a/usr.bin/audio/record/record.c b/usr.bin/audio/record/record.c index a2abf7ebf1c9..01aa05308ecd 100644 --- a/usr.bin/audio/record/record.c +++ b/usr.bin/audio/record/record.c @@ -1,4 +1,4 @@ -/* $NetBSD: record.c,v 1.44 2007/10/05 07:27:41 lukem Exp $ */ +/* $NetBSD: record.c,v 1.45 2007/12/15 19:44:49 perry Exp $ */ /* * Copyright (c) 1999, 2002 Matthew R. Green @@ -34,7 +34,7 @@ #include #ifndef lint -__RCSID("$NetBSD: record.c,v 1.44 2007/10/05 07:27:41 lukem Exp $"); +__RCSID("$NetBSD: record.c,v 1.45 2007/12/15 19:44:49 perry Exp $"); #endif @@ -83,7 +83,7 @@ void (*conv_func) (u_char *, int); void usage (void); int main (int, char *[]); int timeleft (struct timeval *, struct timeval *); -void cleanup (int) __attribute__((__noreturn__)); +void cleanup (int) __dead; int write_header_sun (void **, size_t *, int *); int write_header_wav (void **, size_t *, int *); void write_header (void); diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c index 080d1e03db67..4b6a702761d4 100644 --- a/usr.bin/calendar/calendar.c +++ b/usr.bin/calendar/calendar.c @@ -1,4 +1,4 @@ -/* $NetBSD: calendar.c,v 1.41 2006/10/07 07:12:01 elad Exp $ */ +/* $NetBSD: calendar.c,v 1.42 2007/12/15 19:44:49 perry Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)calendar.c 8.4 (Berkeley) 1/7/95"; #endif -__RCSID("$NetBSD: calendar.c,v 1.41 2006/10/07 07:12:01 elad Exp $"); +__RCSID("$NetBSD: calendar.c,v 1.42 2007/12/15 19:44:49 perry Exp $"); #endif /* not lint */ #include @@ -117,7 +117,7 @@ static int getmonth(char *); static int isnow(char *); static FILE *opencal(void); static void settime(void); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(argc, argv) diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c index a2f46d2ad121..4d513322508f 100644 --- a/usr.bin/cap_mkdb/cap_mkdb.c +++ b/usr.bin/cap_mkdb/cap_mkdb.c @@ -1,4 +1,4 @@ -/* $NetBSD: cap_mkdb.c,v 1.22 2005/04/13 04:50:22 christos Exp $ */ +/* $NetBSD: cap_mkdb.c,v 1.23 2007/12/15 19:44:49 perry Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\ #if 0 static char sccsid[] = "@(#)cap_mkdb.c 8.2 (Berkeley) 4/27/95"; #endif -__RCSID("$NetBSD: cap_mkdb.c,v 1.22 2005/04/13 04:50:22 christos Exp $"); +__RCSID("$NetBSD: cap_mkdb.c,v 1.23 2007/12/15 19:44:49 perry Exp $"); #endif /* not lint */ #include @@ -57,7 +57,7 @@ __RCSID("$NetBSD: cap_mkdb.c,v 1.22 2005/04/13 04:50:22 christos Exp $"); static void db_build(const char **); static void dounlink(void); -static void usage(void) __attribute__((__unused__)); +static void usage(void) __unused; static int count_records(char **); static DB *capdbp; diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c index ef6a58f4cdec..4e37bb99515e 100644 --- a/usr.bin/column/column.c +++ b/usr.bin/column/column.c @@ -1,4 +1,4 @@ -/* $NetBSD: column.c,v 1.16 2006/12/09 21:42:40 christos Exp $ */ +/* $NetBSD: column.c,v 1.17 2007/12/15 19:44:49 perry Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1994\n\ #if 0 static char sccsid[] = "@(#)column.c 8.4 (Berkeley) 5/4/95"; #endif -__RCSID("$NetBSD: column.c,v 1.16 2006/12/09 21:42:40 christos Exp $"); +__RCSID("$NetBSD: column.c,v 1.17 2007/12/15 19:44:49 perry Exp $"); #endif /* not lint */ #include @@ -63,7 +63,7 @@ static void input(FILE *); static void maketbl(void); static void print(void); static void r_columnate(void); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static int termwidth = 80; /* default terminal width */ diff --git a/usr.bin/config/main.c b/usr.bin/config/main.c index 87fb1e843f3b..156fc8440107 100644 --- a/usr.bin/config/main.c +++ b/usr.bin/config/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.24 2007/11/09 05:21:30 cube Exp $ */ +/* $NetBSD: main.c,v 1.25 2007/12/15 19:44:49 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -96,7 +96,7 @@ static struct nvlist **nextmkopt; static struct nvlist **nextappmkopt; static struct nvlist **nextfsopt; -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static void dependopts(void); static void do_depend(struct nvlist *); static void stop(void); diff --git a/usr.bin/csplit/csplit.c b/usr.bin/csplit/csplit.c index b0ca0e30407a..7a9b2ff4d592 100644 --- a/usr.bin/csplit/csplit.c +++ b/usr.bin/csplit/csplit.c @@ -1,4 +1,4 @@ -/* $NetBSD: csplit.c,v 1.3 2007/10/05 07:27:42 lukem Exp $ */ +/* $NetBSD: csplit.c,v 1.4 2007/12/15 19:44:49 perry Exp $ */ /* $FreeBSD: src/usr.bin/csplit/csplit.c,v 1.9 2004/03/22 11:15:03 tjr Exp$ */ /*- @@ -47,7 +47,7 @@ #include #ifndef lint -__RCSID("$NetBSD: csplit.c,v 1.3 2007/10/05 07:27:42 lukem Exp $"); +__RCSID("$NetBSD: csplit.c,v 1.4 2007/12/15 19:44:49 perry Exp $"); #endif #include @@ -73,7 +73,7 @@ static char *getline(void); static void handlesig(int); static FILE *newfile(void); static void toomuch(FILE *, long); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; /* * Command line options diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c index 7a65e147706e..06d4f31a476c 100644 --- a/usr.bin/cut/cut.c +++ b/usr.bin/cut/cut.c @@ -1,4 +1,4 @@ -/* $NetBSD: cut.c,v 1.23 2007/07/02 18:41:03 christos Exp $ */ +/* $NetBSD: cut.c,v 1.24 2007/12/15 19:44:49 perry Exp $ */ /* * Copyright (c) 1989, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95"; #endif -__RCSID("$NetBSD: cut.c,v 1.23 2007/07/02 18:41:03 christos Exp $"); +__RCSID("$NetBSD: cut.c,v 1.24 2007/12/15 19:44:49 perry Exp $"); #endif /* not lint */ #include @@ -69,7 +69,7 @@ static void b_cut(FILE *, const char *); static void c_cut(FILE *, const char *); static void f_cut(FILE *, const char *); static void get_list(char *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(int argc, char *argv[]) diff --git a/usr.bin/deroff/deroff.c b/usr.bin/deroff/deroff.c index 8d5bf3eeb05e..9a92ddad582d 100644 --- a/usr.bin/deroff/deroff.c +++ b/usr.bin/deroff/deroff.c @@ -1,4 +1,4 @@ -/* $NetBSD: deroff.c,v 1.4 2007/12/15 16:32:06 perry Exp $ */ +/* $NetBSD: deroff.c,v 1.5 2007/12/15 19:44:50 perry Exp $ */ /* taken from: OpenBSD: deroff.c,v 1.6 2004/06/02 14:58:46 tom Exp */ @@ -74,7 +74,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)deroff.c 8.1 (Berkeley) 6/6/93"; #else -static const char rcsid[] = "$NetBSD: deroff.c,v 1.4 2007/12/15 16:32:06 perry Exp $"; +static const char rcsid[] = "$NetBSD: deroff.c,v 1.5 2007/12/15 19:44:50 perry Exp $"; #endif #endif /* not lint */ @@ -270,7 +270,7 @@ static void comline(void); static void buildtab(const struct mactab **, int *); static FILE *opn(char *); static struct mactab *macfill(struct mactab *, const struct mactab *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(int ac, char **av) diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c index 7ffac6654742..0f11b4cbf7bd 100644 --- a/usr.bin/expand/expand.c +++ b/usr.bin/expand/expand.c @@ -1,4 +1,4 @@ -/* $NetBSD: expand.c,v 1.10 2005/03/09 02:02:07 christos Exp $ */ +/* $NetBSD: expand.c,v 1.11 2007/12/15 19:44:50 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93"; #endif -__RCSID("$NetBSD: expand.c,v 1.10 2005/03/09 02:02:07 christos Exp $"); +__RCSID("$NetBSD: expand.c,v 1.11 2007/12/15 19:44:50 perry Exp $"); #endif /* not lint */ #include @@ -56,7 +56,7 @@ size_t tabstops[100]; static void getstops(const char *); int main(int, char **); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(int argc, char *argv[]) diff --git a/usr.bin/fdformat/fdformat.c b/usr.bin/fdformat/fdformat.c index 814254755cc9..9825e6bdbe52 100644 --- a/usr.bin/fdformat/fdformat.c +++ b/usr.bin/fdformat/fdformat.c @@ -1,4 +1,4 @@ -/* $NetBSD: fdformat.c,v 1.13 2006/07/21 23:05:14 mishka Exp $ */ +/* $NetBSD: fdformat.c,v 1.14 2007/12/15 19:44:50 perry Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ #include #ifndef lint -__RCSID("$NetBSD: fdformat.c,v 1.13 2006/07/21 23:05:14 mishka Exp $"); +__RCSID("$NetBSD: fdformat.c,v 1.14 2007/12/15 19:44:50 perry Exp $"); #endif #include @@ -74,7 +74,7 @@ static const char *fdb_array[2] = {_PATH_FLOPPYTAB, 0}; #define ALLPARMS (MASK_NBPS|MASK_NCYL|MASK_NSPT|MASK_NTRK|MASK_STEPSPERCYL|MASK_GAPLEN|MASK_FILLBYTE|MASK_XFER_RATE|MASK_INTERLEAVE) static int confirm(int); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static int verify_track(int, int, int, struct fdformat_parms *, char *); int main(int, char **); diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c index fc00b554eaa3..624ea254d270 100644 --- a/usr.bin/fmt/fmt.c +++ b/usr.bin/fmt/fmt.c @@ -1,4 +1,4 @@ -/* $NetBSD: fmt.c,v 1.27 2007/06/03 22:39:21 christos Exp $ */ +/* $NetBSD: fmt.c,v 1.28 2007/12/15 19:44:50 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)fmt.c 8.1 (Berkeley) 7/20/93"; #endif -__RCSID("$NetBSD: fmt.c,v 1.27 2007/06/03 22:39:21 christos Exp $"); +__RCSID("$NetBSD: fmt.c,v 1.28 2007/12/15 19:44:50 perry Exp $"); #endif /* not lint */ #include @@ -76,7 +76,7 @@ static struct buffer outbuf; static const char *headnames[] = {"To", "Subject", "Cc", 0}; -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static int getnum(const char *, const char *, size_t *, int); static void fmt(FILE *); static int ispref(const char *, const char *); diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c index db634b2b10e0..395b9f4b0555 100644 --- a/usr.bin/fstat/fstat.c +++ b/usr.bin/fstat/fstat.c @@ -1,4 +1,4 @@ -/* $NetBSD: fstat.c,v 1.76 2007/09/09 01:26:55 dyoung Exp $ */ +/* $NetBSD: fstat.c,v 1.77 2007/12/15 19:44:50 perry Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\ #if 0 static char sccsid[] = "@(#)fstat.c 8.3 (Berkeley) 5/2/95"; #else -__RCSID("$NetBSD: fstat.c,v 1.76 2007/09/09 01:26:55 dyoung Exp $"); +__RCSID("$NetBSD: fstat.c,v 1.77 2007/12/15 19:44:50 perry Exp $"); #endif #endif /* not lint */ @@ -157,7 +157,7 @@ static const char *inet6_addrstr(struct in6_addr *); static void socktrans(struct socket *, int); static void kqueuetrans(void *, int); static int ufs_filestat(struct vnode *, struct filestat *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static const char *vfilestat(struct vnode *, struct filestat *); static void vtrans(struct vnode *, int, int); static void ftrans(struct file *, int); diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c index 8939f8049516..c8f5ff42285f 100644 --- a/usr.bin/gcore/gcore.c +++ b/usr.bin/gcore/gcore.c @@ -1,4 +1,4 @@ -/* $NetBSD: gcore.c,v 1.9 2006/04/01 22:34:01 christos Exp $ */ +/* $NetBSD: gcore.c,v 1.10 2007/12/15 19:44:50 perry Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__RCSID("$NetBSD: gcore.c,v 1.9 2006/04/01 22:34:01 christos Exp $"); +__RCSID("$NetBSD: gcore.c,v 1.10 2007/12/15 19:44:50 perry Exp $"); #include #include @@ -54,7 +54,7 @@ __RCSID("$NetBSD: gcore.c,v 1.9 2006/04/01 22:34:01 christos Exp $"); #include #include -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static void usage(void) diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c index b50c6250e575..e6895aa344fb 100644 --- a/usr.bin/getconf/getconf.c +++ b/usr.bin/getconf/getconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: getconf.c,v 1.29 2007/10/15 14:12:54 ad Exp $ */ +/* $NetBSD: getconf.c,v 1.30 2007/12/15 19:44:50 perry Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include #ifndef lint -__RCSID("$NetBSD: getconf.c,v 1.29 2007/10/15 14:12:54 ad Exp $"); +__RCSID("$NetBSD: getconf.c,v 1.30 2007/12/15 19:44:50 perry Exp $"); #endif /* not lint */ #include @@ -60,7 +60,7 @@ struct conf_variable static void print_longvar(const char *, long); static void print_strvar(const char *, const char *); static void printvar(const struct conf_variable *, const char *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static const struct conf_variable conf_table[] = { diff --git a/usr.bin/iconv/iconv.c b/usr.bin/iconv/iconv.c index ee4d306b759d..fa001b176960 100644 --- a/usr.bin/iconv/iconv.c +++ b/usr.bin/iconv/iconv.c @@ -1,4 +1,4 @@ -/* $NetBSD: iconv.c,v 1.10 2006/08/26 18:17:42 christos Exp $ */ +/* $NetBSD: iconv.c,v 1.11 2007/12/15 19:44:50 perry Exp $ */ /*- * Copyright (c)2003 Citrus Project, @@ -28,7 +28,7 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: iconv.c,v 1.10 2006/08/26 18:17:42 christos Exp $"); +__RCSID("$NetBSD: iconv.c,v 1.11 2007/12/15 19:44:50 perry Exp $"); #endif /* LIBC_SCCS and not lint */ #include @@ -40,7 +40,7 @@ __RCSID("$NetBSD: iconv.c,v 1.10 2006/08/26 18:17:42 christos Exp $"); #include #include -static void usage(void) __attribute__((__unused__)); +static void usage(void) __unused; 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/innetgr/innetgr.c b/usr.bin/innetgr/innetgr.c index e6f6f5bc684a..c19c6106f0b6 100644 --- a/usr.bin/innetgr/innetgr.c +++ b/usr.bin/innetgr/innetgr.c @@ -1,4 +1,4 @@ -/* $NetBSD: innetgr.c,v 1.5 2004/07/10 16:12:29 wiz Exp $ */ +/* $NetBSD: innetgr.c,v 1.6 2007/12/15 19:44:51 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,14 +37,14 @@ */ #include -__RCSID("$NetBSD: innetgr.c,v 1.5 2004/07/10 16:12:29 wiz Exp $"); +__RCSID("$NetBSD: innetgr.c,v 1.6 2007/12/15 19:44:51 perry Exp $"); #include #include #include #include -static void usage __P((void)) __attribute__((__noreturn__)); +static void usage __P((void)) __dead; int main __P((int, char *[])); static void diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c index 09bae8257794..6029604b9f29 100644 --- a/usr.bin/ipcs/ipcs.c +++ b/usr.bin/ipcs/ipcs.c @@ -1,4 +1,4 @@ -/* $NetBSD: ipcs.c,v 1.38 2007/12/15 16:32:06 perry Exp $ */ +/* $NetBSD: ipcs.c,v 1.39 2007/12/15 19:44:51 perry Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -118,7 +118,7 @@ static void show_shminfo(time_t, time_t, time_t, int, u_int64_t, mode_t, uid_t, gid_t, uid_t, gid_t, u_int32_t, u_int64_t, pid_t, pid_t); static void show_shminfo_hdr(void); static void show_shmtotal(struct shminfo *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static void unconfsem(void); static void unconfmsg(void); static void unconfshm(void); diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 5b647f73fc4e..ede8a542b091 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -1,4 +1,4 @@ -/* $NetBSD: kdump.c,v 1.94 2007/11/07 22:22:31 dsl Exp $ */ +/* $NetBSD: kdump.c,v 1.95 2007/12/15 19:44:51 perry Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\ #if 0 static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: kdump.c,v 1.94 2007/11/07 22:22:31 dsl Exp $"); +__RCSID("$NetBSD: kdump.c,v 1.95 2007/12/15 19:44:51 perry Exp $"); #endif #endif /* not lint */ @@ -116,7 +116,7 @@ static void ktruser(struct ktr_user *, int); static void ktrmmsg(struct ktr_mmsg *, int); static void ktrmool(struct ktr_mool *, int); static void ktrmib(int *, int); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static void eprint(int); static void rprint(register_t); static const char *signame(long, int); diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c index 9cb0f4e196cc..8bcb0d854aed 100644 --- a/usr.bin/lastcomm/lastcomm.c +++ b/usr.bin/lastcomm/lastcomm.c @@ -1,4 +1,4 @@ -/* $NetBSD: lastcomm.c,v 1.18 2005/03/28 23:33:22 christos Exp $ */ +/* $NetBSD: lastcomm.c,v 1.19 2007/12/15 19:44:51 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)lastcomm.c 8.2 (Berkeley) 4/29/95"; #endif -__RCSID("$NetBSD: lastcomm.c,v 1.18 2005/03/28 23:33:22 christos Exp $"); +__RCSID("$NetBSD: lastcomm.c,v 1.19 2007/12/15 19:44:51 perry Exp $"); #endif /* not lint */ #include @@ -65,7 +65,7 @@ static time_t expand(u_int); static char *flagbits(int); static const char *getdev(dev_t); static int requested(char *[], struct acct *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(int, char **); diff --git a/usr.bin/ldd/ldd_elf/ldd.c b/usr.bin/ldd/ldd_elf/ldd.c index e7e599edea1a..defccba6de38 100644 --- a/usr.bin/ldd/ldd_elf/ldd.c +++ b/usr.bin/ldd/ldd_elf/ldd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ldd.c,v 1.30 2007/10/08 12:51:21 christos Exp $ */ +/* $NetBSD: ldd.c,v 1.31 2007/12/15 19:44:51 perry Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ #include #ifndef lint -__RCSID("$NetBSD: ldd.c,v 1.30 2007/10/08 12:51:21 christos Exp $"); +__RCSID("$NetBSD: ldd.c,v 1.31 2007/12/15 19:44:51 perry Exp $"); #endif /* not lint */ #include @@ -109,7 +109,7 @@ Library_Xform *_rtld_xforms; static void fmtprint(const char *, Obj_Entry *, const char *, const char *); static void print_needed(Obj_Entry *, const char *, const char *); static int ldd_aout(char *, char *, char *, int); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static char *main_local; static char *main_progname; diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c index c2688beeeb95..5b16752221f6 100644 --- a/usr.bin/lock/lock.c +++ b/usr.bin/lock/lock.c @@ -1,4 +1,4 @@ -/* $NetBSD: lock.c,v 1.26 2007/02/07 14:11:30 hubertf Exp $ */ +/* $NetBSD: lock.c,v 1.27 2007/12/15 19:44:51 perry Exp $ */ /* * Copyright (c) 1980, 1987, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1987, 1993\n\ #if 0 static char sccsid[] = "@(#)lock.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: lock.c,v 1.26 2007/02/07 14:11:30 hubertf Exp $"); +__RCSID("$NetBSD: lock.c,v 1.27 2007/12/15 19:44:51 perry Exp $"); #endif /* not lint */ /* @@ -75,9 +75,9 @@ __RCSID("$NetBSD: lock.c,v 1.26 2007/02/07 14:11:30 hubertf Exp $"); int main(int, char **); -static void bye(int) __attribute__((__noreturn__)); +static void bye(int) __dead; static void hi(int); -static void quit(int) __attribute__((__noreturn__)); +static void quit(int) __dead; #ifdef SKEY static int skey_auth(const char *); #endif diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c index 975ae9cdb3af..b354231a1e71 100644 --- a/usr.bin/mail/list.c +++ b/usr.bin/mail/list.c @@ -1,4 +1,4 @@ -/* $NetBSD: list.c,v 1.22 2007/10/30 02:28:31 christos Exp $ */ +/* $NetBSD: list.c,v 1.23 2007/12/15 19:44:51 perry Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)list.c 8.4 (Berkeley) 5/1/95"; #else -__RCSID("$NetBSD: list.c,v 1.22 2007/10/30 02:28:31 christos Exp $"); +__RCSID("$NetBSD: list.c,v 1.23 2007/12/15 19:44:51 perry Exp $"); #endif #endif /* not lint */ @@ -1314,7 +1314,7 @@ first(int f, int m) /* * Show all headers without paging. (-H flag) */ -__attribute__((__noreturn__)) +__dead PUBLIC int show_headers_and_exit(int flags) { diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c index cc650ba0168d..5b7ff758bb07 100644 --- a/usr.bin/mktemp/mktemp.c +++ b/usr.bin/mktemp/mktemp.c @@ -1,4 +1,4 @@ -/* $NetBSD: mktemp.c,v 1.9 2007/12/15 16:32:06 perry Exp $ */ +/* $NetBSD: mktemp.c,v 1.10 2007/12/15 19:44:52 perry Exp $ */ /*- * Copyright (c) 1994, 1995, 1996, 1998 Peter Wemm @@ -50,10 +50,10 @@ #include #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: mktemp.c,v 1.9 2007/12/15 16:32:06 perry Exp $"); +__RCSID("$NetBSD: mktemp.c,v 1.10 2007/12/15 19:44:52 perry Exp $"); #endif /* !__lint */ -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(int argc, char **argv) diff --git a/usr.bin/modstat/modstat.c b/usr.bin/modstat/modstat.c index bbb327928504..64883e76a02d 100644 --- a/usr.bin/modstat/modstat.c +++ b/usr.bin/modstat/modstat.c @@ -1,4 +1,4 @@ -/* $NetBSD: modstat.c,v 1.22 2006/05/15 14:30:38 christos Exp $ */ +/* $NetBSD: modstat.c,v 1.23 2007/12/15 19:44:52 perry Exp $ */ /* * Copyright (c) 1993 Terrence R. Lambert. @@ -34,7 +34,7 @@ #include #ifndef lint -__RCSID("$NetBSD: modstat.c,v 1.22 2006/05/15 14:30:38 christos Exp $"); +__RCSID("$NetBSD: modstat.c,v 1.23 2007/12/15 19:44:52 perry Exp $"); #endif #include @@ -56,7 +56,7 @@ __RCSID("$NetBSD: modstat.c,v 1.22 2006/05/15 14:30:38 christos Exp $"); static void cleanup(void); static int dostat(int, const char *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static const char *type_names[] = { diff --git a/usr.bin/netgroup/netgroup.c b/usr.bin/netgroup/netgroup.c index 611822b77a45..64ab1e82bf90 100644 --- a/usr.bin/netgroup/netgroup.c +++ b/usr.bin/netgroup/netgroup.c @@ -1,4 +1,4 @@ -/* $NetBSD: netgroup.c,v 1.4 2004/01/05 23:23:36 jmmv Exp $ */ +/* $NetBSD: netgroup.c,v 1.5 2007/12/15 19:44:52 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,14 +37,14 @@ */ #include -__RCSID("$NetBSD: netgroup.c,v 1.4 2004/01/05 23:23:36 jmmv Exp $"); +__RCSID("$NetBSD: netgroup.c,v 1.5 2007/12/15 19:44:52 perry Exp $"); #include #include #include #include -static void usage __P((void)) __attribute__((__noreturn__)); +static void usage __P((void)) __dead; int main __P((int, char *[])); static void diff --git a/usr.bin/newsyslog/newsyslog.c b/usr.bin/newsyslog/newsyslog.c index de96532c7062..2dbcf4f6c0c4 100644 --- a/usr.bin/newsyslog/newsyslog.c +++ b/usr.bin/newsyslog/newsyslog.c @@ -1,4 +1,4 @@ -/* $NetBSD: newsyslog.c,v 1.49 2007/07/22 17:03:13 christos Exp $ */ +/* $NetBSD: newsyslog.c,v 1.50 2007/12/15 19:44:52 perry Exp $ */ /* * Copyright (c) 1999, 2000 Andrew Doran @@ -55,7 +55,7 @@ #include #ifndef lint -__RCSID("$NetBSD: newsyslog.c,v 1.49 2007/07/22 17:03:13 christos Exp $"); +__RCSID("$NetBSD: newsyslog.c,v 1.50 2007/12/15 19:44:52 perry Exp $"); #endif /* not lint */ #include @@ -119,7 +119,7 @@ static time_t parse_iso8601(char *); static time_t parse_dwm(char *); static int parse_userspec(const char *, struct passwd **, struct group **); static pid_t readpidfile(const char *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static void log_compress(struct conf_entry *, const char *); static void log_create(struct conf_entry *); diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c index a1320a0fe80b..35144ebdc49f 100644 --- a/usr.bin/nice/nice.c +++ b/usr.bin/nice/nice.c @@ -1,4 +1,4 @@ -/* $NetBSD: nice.c,v 1.13 2005/10/05 21:20:46 christos Exp $ */ +/* $NetBSD: nice.c,v 1.14 2007/12/15 19:44:52 perry Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -40,7 +40,7 @@ __COPYRIGHT( #if 0 static char sccsid[] = "@(#)nice.c 5.4 (Berkeley) 6/1/90"; #endif -__RCSID("$NetBSD: nice.c,v 1.13 2005/10/05 21:20:46 christos Exp $"); +__RCSID("$NetBSD: nice.c,v 1.14 2007/12/15 19:44:52 perry Exp $"); #endif /* not lint */ #include @@ -58,7 +58,7 @@ __RCSID("$NetBSD: nice.c,v 1.13 2005/10/05 21:20:46 christos Exp $"); #define DEFNICE 10 -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(int argc, char **argv) diff --git a/usr.bin/pkill/pkill.c b/usr.bin/pkill/pkill.c index 72651d190ddb..c706dd8f17ee 100644 --- a/usr.bin/pkill/pkill.c +++ b/usr.bin/pkill/pkill.c @@ -1,4 +1,4 @@ -/* $NetBSD: pkill.c,v 1.21 2007/03/21 20:05:18 erh Exp $ */ +/* $NetBSD: pkill.c,v 1.22 2007/12/15 19:44:52 perry Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include #ifndef lint -__RCSID("$NetBSD: pkill.c,v 1.21 2007/03/21 20:05:18 erh Exp $"); +__RCSID("$NetBSD: pkill.c,v 1.22 2007/12/15 19:44:52 perry Exp $"); #endif /* !lint */ #include @@ -108,7 +108,7 @@ static struct listhead tdevlist = SLIST_HEAD_INITIALIZER(list); static struct listhead sidlist = SLIST_HEAD_INITIALIZER(list); int main(int, char **); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static int killact(const struct kinfo_proc2 *); static int grepact(const struct kinfo_proc2 *); static void makelist(struct listhead *, enum listtype, char *); diff --git a/usr.bin/pmc/pmc.c b/usr.bin/pmc/pmc.c index 3efa6d332444..719605b36fa8 100644 --- a/usr.bin/pmc/pmc.c +++ b/usr.bin/pmc/pmc.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmc.c,v 1.15 2006/10/22 16:25:19 christos Exp $ */ +/* $NetBSD: pmc.c,v 1.16 2007/12/15 19:44:52 perry Exp $ */ /* * Copyright 2000 Wasabi Systems, Inc. @@ -37,7 +37,7 @@ #include #ifndef lint -__RCSID("$NetBSD: pmc.c,v 1.15 2006/10/22 16:25:19 christos Exp $"); +__RCSID("$NetBSD: pmc.c,v 1.16 2007/12/15 19:44:52 perry Exp $"); #endif #include @@ -369,7 +369,7 @@ list_pmc_names(const struct pmc_name2val_cpus *pncp) (void)printf("\t%37s\n", pncp->pmc_names[n - 1].name); } -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static void usage(void) { diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c index 2a8053f413fa..75e4089acf0c 100644 --- a/usr.bin/renice/renice.c +++ b/usr.bin/renice/renice.c @@ -1,4 +1,4 @@ -/* $NetBSD: renice.c,v 1.16 2005/10/09 18:23:52 christos Exp $ */ +/* $NetBSD: renice.c,v 1.17 2007/12/15 19:44:52 perry Exp $ */ /* * Copyright (c) 1983, 1989, 1993 @@ -37,7 +37,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993\n\ #ifndef lint /*static char sccsid[] = "from: @(#)renice.c 8.1 (Berkeley) 6/9/93";*/ -__RCSID("$NetBSD: renice.c,v 1.16 2005/10/09 18:23:52 christos Exp $"); +__RCSID("$NetBSD: renice.c,v 1.17 2007/12/15 19:44:52 perry Exp $"); #endif /* not lint */ #include @@ -53,7 +53,7 @@ __RCSID("$NetBSD: renice.c,v 1.16 2005/10/09 18:23:52 christos Exp $"); static int getnum(const char *, const char *, int *); static int donice(int, id_t, int, int); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; /* * Change the priority (nice) of processes diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c index e6700fe0cbb0..7c0e5999acc0 100644 --- a/usr.bin/rup/rup.c +++ b/usr.bin/rup/rup.c @@ -1,4 +1,4 @@ -/* $NetBSD: rup.c,v 1.26 2005/08/07 16:01:45 christos Exp $ */ +/* $NetBSD: rup.c,v 1.27 2007/12/15 19:44:53 perry Exp $ */ /*- * Copyright (c) 1993, John Brezak @@ -35,7 +35,7 @@ #include #ifndef lint -__RCSID("$NetBSD: rup.c,v 1.26 2005/08/07 16:01:45 christos Exp $"); +__RCSID("$NetBSD: rup.c,v 1.27 2007/12/15 19:44:53 perry Exp $"); #endif /* not lint */ #include @@ -155,7 +155,7 @@ static int rstat_reply(char *, struct netbuf *, struct netconfig *); static void print_rup_data(const char *, statstime *); static int onehost(char *); static void allhosts(void); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(int, char *[]); int diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c index c598cc7189ba..242a0a5b1a8a 100644 --- a/usr.bin/rwho/rwho.c +++ b/usr.bin/rwho/rwho.c @@ -1,4 +1,4 @@ -/* $NetBSD: rwho.c,v 1.16 2005/10/01 13:33:21 he Exp $ */ +/* $NetBSD: rwho.c,v 1.17 2007/12/15 19:44:53 perry Exp $ */ /* * Copyright (c) 1983, 1993 @@ -37,7 +37,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\ #ifndef lint /*static char sccsid[] = "from: @(#)rwho.c 8.1 (Berkeley) 6/6/93";*/ -__RCSID("$NetBSD: rwho.c,v 1.16 2005/10/01 13:33:21 he Exp $"); +__RCSID("$NetBSD: rwho.c,v 1.17 2007/12/15 19:44:53 perry Exp $"); #endif /* not lint */ #include @@ -57,7 +57,7 @@ __RCSID("$NetBSD: rwho.c,v 1.16 2005/10/01 13:33:21 he Exp $"); #include #include -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static int utmpcmp(const void *, const void *); /* diff --git a/usr.bin/spell/spellprog/spellprog.c b/usr.bin/spell/spellprog/spellprog.c index 3a973f402af7..fd0c30f9d0aa 100644 --- a/usr.bin/spell/spellprog/spellprog.c +++ b/usr.bin/spell/spellprog/spellprog.c @@ -1,4 +1,4 @@ -/* $NetBSD: spellprog.c,v 1.7 2007/12/15 16:32:07 perry Exp $ */ +/* $NetBSD: spellprog.c,v 1.8 2007/12/15 19:44:53 perry Exp $ */ /* derived from OpenBSD: spellprog.c,v 1.4 2003/06/03 02:56:16 millert Exp */ @@ -113,7 +113,7 @@ static void ise(void); static void print_word(FILE *); static void ztos(char *); static int monosyl(char *, char *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static void getderiv(size_t); static int an(char *, const char *, const char *, size_t); diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index 9e2a263d47de..8552d9dba086 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -1,4 +1,4 @@ -/* $NetBSD: split.c,v 1.22 2007/05/31 01:35:35 jschauma Exp $ */ +/* $NetBSD: split.c,v 1.23 2007/12/15 19:44:53 perry Exp $ */ /* * Copyright (c) 1987, 1993, 1994 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994\n\ #if 0 static char sccsid[] = "@(#)split.c 8.3 (Berkeley) 4/25/94"; #endif -__RCSID("$NetBSD: split.c,v 1.22 2007/05/31 01:35:35 jschauma Exp $"); +__RCSID("$NetBSD: split.c,v 1.23 2007/12/15 19:44:53 perry Exp $"); #endif /* not lint */ #include @@ -65,7 +65,7 @@ static void newfile(void); static void split1(off_t, int); static void split2(off_t); static void split3(off_t); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static size_t bigwrite(int, void const *, size_t); int diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c index da71ab342361..8c2d07aed617 100644 --- a/usr.bin/tput/tput.c +++ b/usr.bin/tput/tput.c @@ -1,4 +1,4 @@ -/* $NetBSD: tput.c,v 1.17 2005/07/30 14:43:13 christos Exp $ */ +/* $NetBSD: tput.c,v 1.18 2007/12/15 19:44:53 perry Exp $ */ /*- * Copyright (c) 1980, 1988, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1988, 1993\n\ #if 0 static char sccsid[] = "@(#)tput.c 8.3 (Berkeley) 4/28/95"; #endif -__RCSID("$NetBSD: tput.c,v 1.17 2005/07/30 14:43:13 christos Exp $"); +__RCSID("$NetBSD: tput.c,v 1.18 2007/12/15 19:44:53 perry Exp $"); #endif /* not lint */ #include @@ -54,7 +54,7 @@ __RCSID("$NetBSD: tput.c,v 1.17 2005/07/30 14:43:13 christos Exp $"); static int outc(int); static void prlongname(char *); static void setospeed(void); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static char **process(const char *, char *, char **); int diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c index 2583b3501deb..44697611665e 100644 --- a/usr.bin/uniq/uniq.c +++ b/usr.bin/uniq/uniq.c @@ -1,4 +1,4 @@ -/* $NetBSD: uniq.c,v 1.13 2007/01/06 02:18:24 christos Exp $ */ +/* $NetBSD: uniq.c,v 1.14 2007/12/15 19:44:53 perry Exp $ */ /* * Copyright (c) 1989, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)uniq.c 8.3 (Berkeley) 5/4/95"; #endif -__RCSID("$NetBSD: uniq.c,v 1.13 2007/01/06 02:18:24 christos Exp $"); +__RCSID("$NetBSD: uniq.c,v 1.14 2007/12/15 19:44:53 perry Exp $"); #endif /* not lint */ #include @@ -60,7 +60,7 @@ static FILE *file(const char *, const char *); static void show(FILE *, const char *); static const char *skip(const char *); static void obsolete(char *[]); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main (int argc, char *argv[]) diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c index 80451e18eade..0ccf87130437 100644 --- a/usr.bin/usbhidaction/usbhidaction.c +++ b/usr.bin/usbhidaction/usbhidaction.c @@ -1,4 +1,4 @@ -/* $NetBSD: usbhidaction.c,v 1.21 2006/05/19 14:43:58 christos Exp $ */ +/* $NetBSD: usbhidaction.c,v 1.22 2007/12/15 19:44:53 perry Exp $ */ /* * Copyright (c) 2000, 2002 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include #ifndef lint -__RCSID("$NetBSD: usbhidaction.c,v 1.21 2006/05/19 14:43:58 christos Exp $"); +__RCSID("$NetBSD: usbhidaction.c,v 1.22 2007/12/15 19:44:53 perry Exp $"); #endif #include @@ -76,7 +76,7 @@ static struct command *commands; #define SIZE 4000 -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static struct command *parse_conf(const char *, report_desc_t, int, int); static void docmd(struct command *, int, const char *, int, char **); static void freecommands(struct command *); diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c index 814322ffeb65..14b1408eec93 100644 --- a/usr.bin/vacation/vacation.c +++ b/usr.bin/vacation/vacation.c @@ -1,4 +1,4 @@ -/* $NetBSD: vacation.c,v 1.34 2007/07/13 14:52:15 christos Exp $ */ +/* $NetBSD: vacation.c,v 1.35 2007/12/15 19:44:54 perry Exp $ */ /* * Copyright (c) 1983, 1987, 1993 @@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1987, 1993\n\ #if 0 static char sccsid[] = "@(#)vacation.c 8.2 (Berkeley) 1/26/94"; #endif -__RCSID("$NetBSD: vacation.c,v 1.34 2007/07/13 14:52:15 christos Exp $"); +__RCSID("$NetBSD: vacation.c,v 1.35 2007/12/15 19:44:54 perry Exp $"); #endif /* not lint */ /* @@ -115,7 +115,7 @@ static void getfrom(char *); static void sendmessage(const char *); static void setinterval(time_t); static void setreply(void); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(int argc, char **argv) diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c index e2e757c60032..2412566f5cda 100644 --- a/usr.bin/whereis/whereis.c +++ b/usr.bin/whereis/whereis.c @@ -1,4 +1,4 @@ -/* $NetBSD: whereis.c,v 1.18 2006/07/30 11:50:29 martin Exp $ */ +/* $NetBSD: whereis.c,v 1.19 2007/12/15 19:44:54 perry Exp $ */ /*- * Copyright (c) 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\ #if 0 static char sccsid[] = "@(#)whereis.c 8.3 (Berkeley) 5/4/95"; #endif -__RCSID("$NetBSD: whereis.c,v 1.18 2006/07/30 11:50:29 martin Exp $"); +__RCSID("$NetBSD: whereis.c,v 1.19 2007/12/15 19:44:54 perry Exp $"); #endif /* not lint */ #include @@ -53,7 +53,7 @@ __RCSID("$NetBSD: whereis.c,v 1.18 2006/07/30 11:50:29 martin Exp $"); #include #include -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(int argc, char *argv[]) diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c index b82504735cfc..3f6edd114bd4 100644 --- a/usr.bin/who/who.c +++ b/usr.bin/who/who.c @@ -1,4 +1,4 @@ -/* $NetBSD: who.c,v 1.20 2006/09/28 15:24:31 christos Exp $ */ +/* $NetBSD: who.c,v 1.21 2007/12/15 19:44:54 perry Exp $ */ /* * Copyright (c) 1989, 1993 @@ -43,7 +43,7 @@ __COPYRIGHT( #if 0 static char sccsid[] = "@(#)who.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: who.c,v 1.20 2006/09/28 15:24:31 christos Exp $"); +__RCSID("$NetBSD: who.c,v 1.21 2007/12/15 19:44:54 perry Exp $"); #endif /* not lint */ #include @@ -68,7 +68,7 @@ __RCSID("$NetBSD: who.c,v 1.20 2006/09/28 15:24:31 christos Exp $"); static void output_labels(void); static void who_am_i(const char *, int); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static void process(const char *, int); static void eprint(const struct utmpentry *); static void print(const char *, const char *, time_t, const char *, pid_t pid, diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c index 6dc18ca10c80..63e612f97954 100644 --- a/usr.bin/whois/whois.c +++ b/usr.bin/whois/whois.c @@ -1,4 +1,4 @@ -/* $NetBSD: whois.c,v 1.31 2007/09/09 18:31:45 christos Exp $ */ +/* $NetBSD: whois.c,v 1.32 2007/12/15 19:44:54 perry Exp $ */ /* $OpenBSD: whois.c,v 1.28 2003/09/18 22:16:15 fgsch Exp $ */ /* @@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static const char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: whois.c,v 1.31 2007/09/09 18:31:45 christos Exp $"); +__RCSID("$NetBSD: whois.c,v 1.32 2007/12/15 19:44:54 perry Exp $"); #endif #endif /* not lint */ @@ -86,7 +86,7 @@ static const char *port_whois = WHOIS_PORT; static const char *ip_whois[] = { LNICHOST, RNICHOST, PNICHOST, FNICHOST, BNICHOST, NULL }; -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static int whois(const char *, const char *, const char *, int); static char *choose_server(const char *, const char *); diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 2b5349730815..b7a3fe7fe0b3 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -1,4 +1,4 @@ -/* $NetBSD: xargs.c,v 1.16 2007/04/18 15:56:07 christos Exp $ */ +/* $NetBSD: xargs.c,v 1.17 2007/12/15 19:44:54 perry Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\ static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93"; __FBSDID("$FreeBSD: src/usr.bin/xargs/xargs.c,v 1.62 2006/01/01 22:59:54 jmallett Exp $"); #endif -__RCSID("$NetBSD: xargs.c,v 1.16 2007/04/18 15:56:07 christos Exp $"); +__RCSID("$NetBSD: xargs.c,v 1.17 2007/12/15 19:44:54 perry Exp $"); #endif /* not lint */ #include @@ -67,7 +67,7 @@ static void parse_input(int, char *[]); static void prerun(int, char *[]); static int prompt(void); static void run(char **); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; void strnsubst(char **, const char *, const char *, size_t); static void waitchildren(const char *, int); diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c index 37d3eb7febdb..10c41b4ce715 100644 --- a/usr.bin/yacc/main.c +++ b/usr.bin/yacc/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.18 2006/05/25 21:43:40 jnemeth Exp $ */ +/* $NetBSD: main.c,v 1.19 2007/12/15 19:44:54 perry Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989 The Regents of the University of California #if 0 static char sccsid[] = "@(#)main.c 5.5 (Berkeley) 5/24/93"; #else -__RCSID("$NetBSD: main.c,v 1.18 2006/05/25 21:43:40 jnemeth Exp $"); +__RCSID("$NetBSD: main.c,v 1.19 2007/12/15 19:44:54 perry Exp $"); #endif #endif /* not lint */ @@ -115,9 +115,9 @@ static char *temp_form = "yacc.XXXXXXX"; static int explicit_file_name; -static __dead void onintr(int) __attribute__((__noreturn__)); +static __dead void onintr(int); static void set_signals(void); -static __dead void usage(void) __attribute__((__noreturn__)); +static __dead void usage(void); static void getargs(int, char *[]); static void create_file_names(void); static void open_files(void); diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index 7cd76e315fde..6615dce17ac0 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -1,4 +1,4 @@ -/* $NetBSD: arp.c,v 1.44 2006/10/22 20:54:38 christos Exp $ */ +/* $NetBSD: arp.c,v 1.45 2007/12/15 19:44:54 perry Exp $ */ /* * Copyright (c) 1984, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1984, 1993\n\ #if 0 static char sccsid[] = "@(#)arp.c 8.3 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: arp.c,v 1.44 2006/10/22 20:54:38 christos Exp $"); +__RCSID("$NetBSD: arp.c,v 1.45 2007/12/15 19:44:54 perry Exp $"); #endif #endif /* not lint */ @@ -93,7 +93,7 @@ static int getinetaddr(const char *, struct in_addr *); static void getsocket(void); static int rtmsg(int); static int set(int, char **); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static pid_t pid; static int aflag, nflag, vflag; diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c index 4822560d2568..0b7ab83d86b1 100644 --- a/usr.sbin/chroot/chroot.c +++ b/usr.sbin/chroot/chroot.c @@ -1,4 +1,4 @@ -/* $NetBSD: chroot.c,v 1.13 2003/08/07 11:25:14 agc Exp $ */ +/* $NetBSD: chroot.c,v 1.14 2007/12/15 19:44:55 perry Exp $ */ /* * Copyright (c) 1988, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\ #if 0 static char sccsid[] = "@(#)chroot.c 8.1 (Berkeley) 6/9/93"; #else -__RCSID("$NetBSD: chroot.c,v 1.13 2003/08/07 11:25:14 agc Exp $"); +__RCSID("$NetBSD: chroot.c,v 1.14 2007/12/15 19:44:55 perry Exp $"); #endif #endif /* not lint */ @@ -57,7 +57,7 @@ __RCSID("$NetBSD: chroot.c,v 1.13 2003/08/07 11:25:14 agc Exp $"); #include int main(int, char **); -void usage(void) __attribute__((__noreturn__)); +void usage(void) __dead; char *user; /* user to switch to before running program */ char *group; /* group to switch to ... */ diff --git a/usr.sbin/dev_mkdb/dev_mkdb.c b/usr.sbin/dev_mkdb/dev_mkdb.c index 536eb5fb5bc4..8ebab07cdbb3 100644 --- a/usr.sbin/dev_mkdb/dev_mkdb.c +++ b/usr.sbin/dev_mkdb/dev_mkdb.c @@ -1,4 +1,4 @@ -/* $NetBSD: dev_mkdb.c,v 1.23 2005/11/18 05:11:30 christos Exp $ */ +/* $NetBSD: dev_mkdb.c,v 1.24 2007/12/15 19:44:55 perry Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\ #if 0 static char sccsid[] = "from: @(#)dev_mkdb.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: dev_mkdb.c,v 1.23 2005/11/18 05:11:30 christos Exp $"); +__RCSID("$NetBSD: dev_mkdb.c,v 1.24 2007/12/15 19:44:55 perry Exp $"); #endif #endif /* not lint */ @@ -59,7 +59,7 @@ __RCSID("$NetBSD: dev_mkdb.c,v 1.23 2005/11/18 05:11:30 christos Exp $"); #include #include -static void usage(void) __attribute__((__unused__)); +static void usage(void) __unused; HASHINFO openinfo = { 4096, /* bsize */ diff --git a/usr.sbin/ipwctl/ipwctl.c b/usr.sbin/ipwctl/ipwctl.c index 021cb4fb2f5f..0e0f287bf66e 100644 --- a/usr.sbin/ipwctl/ipwctl.c +++ b/usr.sbin/ipwctl/ipwctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: ipwctl.c,v 1.8 2006/08/06 07:31:32 skrll Exp $ */ +/* $NetBSD: ipwctl.c,v 1.9 2007/12/15 19:44:55 perry Exp $ */ /* Id: ipwctl.c,v 1.1.2.1 2004/08/19 16:24:50 damien Exp */ /*- @@ -29,7 +29,7 @@ */ #include -__RCSID("$NetBSD: ipwctl.c,v 1.8 2006/08/06 07:31:32 skrll Exp $"); +__RCSID("$NetBSD: ipwctl.c,v 1.9 2007/12/15 19:44:55 perry Exp $"); #include #include @@ -51,7 +51,7 @@ __RCSID("$NetBSD: ipwctl.c,v 1.8 2006/08/06 07:31:32 skrll Exp $"); #define SIOCGRADIO _IOWR('i', 139, struct ifreq) #define SIOCGTABLE1 _IOWR('i', 140, struct ifreq) -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static int do_req(const char *, unsigned long, void *); static void get_radio_state(const char *); static void get_statistics(const char *); diff --git a/usr.sbin/iwictl/iwictl.c b/usr.sbin/iwictl/iwictl.c index a7d7a254b6aa..25bd65dd65d7 100644 --- a/usr.sbin/iwictl/iwictl.c +++ b/usr.sbin/iwictl/iwictl.c @@ -1,4 +1,4 @@ -/* $NetBSD: iwictl.c,v 1.7 2006/08/09 11:57:51 skrll Exp $ */ +/* $NetBSD: iwictl.c,v 1.8 2007/12/15 19:44:55 perry Exp $ */ /*- * Copyright (c) 2004, 2005 @@ -28,7 +28,7 @@ */ #include -__RCSID("$NetBSD: iwictl.c,v 1.7 2006/08/09 11:57:51 skrll Exp $"); +__RCSID("$NetBSD: iwictl.c,v 1.8 2007/12/15 19:44:55 perry Exp $"); #include #include @@ -50,7 +50,7 @@ __RCSID("$NetBSD: iwictl.c,v 1.7 2006/08/09 11:57:51 skrll Exp $"); #define SIOCGRADIO _IOWR('i', 139, struct ifreq) #define SIOCGTABLE0 _IOWR('i', 140, struct ifreq) -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static int do_req(const char *, unsigned long, void *); static void get_radio_state(const char *); static void get_statistics(const char *); diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c index f5e0cfaaea7d..15483386ea87 100644 --- a/usr.sbin/lpr/lpq/lpq.c +++ b/usr.sbin/lpr/lpq/lpq.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpq.c,v 1.16 2005/11/28 03:26:06 christos Exp $ */ +/* $NetBSD: lpq.c,v 1.17 2007/12/15 19:44:55 perry Exp $ */ /* * Copyright (c) 1983, 1993 @@ -37,7 +37,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\ #if 0 static char sccsid[] = "@(#)lpq.c 8.3 (Berkeley) 5/10/95"; #else -__RCSID("$NetBSD: lpq.c,v 1.16 2005/11/28 03:26:06 christos Exp $"); +__RCSID("$NetBSD: lpq.c,v 1.17 2007/12/15 19:44:55 perry Exp $"); #endif #endif /* not lint */ @@ -71,7 +71,7 @@ char *user[MAXUSERS]; /* users to process */ int users; /* # of users in user array */ uid_t uid, euid; -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(int argc, char *argv[]) diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c index e084c4a76826..7f7adf1b3cab 100644 --- a/usr.sbin/lpr/lpr/lpr.c +++ b/usr.sbin/lpr/lpr/lpr.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpr.c,v 1.36 2007/09/11 15:46:56 ginsbach Exp $ */ +/* $NetBSD: lpr.c,v 1.37 2007/12/15 19:44:55 perry Exp $ */ /* * Copyright (c) 1983, 1989, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)lpr.c 8.4 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: lpr.c,v 1.36 2007/09/11 15:46:56 ginsbach Exp $"); +__RCSID("$NetBSD: lpr.c,v 1.37 2007/12/15 19:44:55 perry Exp $"); #endif #endif /* not lint */ @@ -114,7 +114,7 @@ static char *lmktemp(const char *, int, int); static void mktemps(void); static int nfile(char *); static int test(const char *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; uid_t uid, euid; diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c index a76b81f9e3f4..9894a8cc0b55 100644 --- a/usr.sbin/lpr/lprm/lprm.c +++ b/usr.sbin/lpr/lprm/lprm.c @@ -1,4 +1,4 @@ -/* $NetBSD: lprm.c,v 1.17 2005/11/28 03:26:07 christos Exp $ */ +/* $NetBSD: lprm.c,v 1.18 2007/12/15 19:44:55 perry Exp $ */ /* * Copyright (c) 1983, 1993 @@ -37,7 +37,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\ #if 0 static char sccsid[] = "@(#)lprm.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lprm.c,v 1.17 2005/11/28 03:26:07 christos Exp $"); +__RCSID("$NetBSD: lprm.c,v 1.18 2007/12/15 19:44:55 perry Exp $"); #endif #endif /* not lint */ @@ -79,7 +79,7 @@ uid_t uid, euid; /* real and effective user id's */ static char luser[16]; /* buffer for person */ -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(int argc, char *argv[]) diff --git a/usr.sbin/mdsetimage/mdsetimage.c b/usr.sbin/mdsetimage/mdsetimage.c index fbe8a2d61587..2e1c6b8e39a6 100644 --- a/usr.sbin/mdsetimage/mdsetimage.c +++ b/usr.sbin/mdsetimage/mdsetimage.c @@ -1,4 +1,4 @@ -/* $NetBSD: mdsetimage.c,v 1.16 2001/10/01 23:32:34 cgd Exp $ */ +/* $NetBSD: mdsetimage.c,v 1.17 2007/12/15 19:44:55 perry Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou @@ -37,7 +37,7 @@ __COPYRIGHT( #endif /* not lint */ #ifndef lint -__RCSID("$NetBSD: mdsetimage.c,v 1.16 2001/10/01 23:32:34 cgd Exp $"); +__RCSID("$NetBSD: mdsetimage.c,v 1.17 2007/12/15 19:44:55 perry Exp $"); #endif /* not lint */ #include @@ -55,7 +55,7 @@ __RCSID("$NetBSD: mdsetimage.c,v 1.16 2001/10/01 23:32:34 cgd Exp $"); #include "extern.h" int main __P((int, char *[])); -static void usage __P((void)) __attribute__((noreturn)); +static void usage __P((void)) __dead; static int find_md_root __P((const char *, const char *, size_t, const struct nlist *, size_t *, u_int32_t *)); diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c index 3b46b11093cb..52e6415cfa9c 100644 --- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c +++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c @@ -1,4 +1,4 @@ -/* $NetBSD: netgroup_mkdb.c,v 1.15 2006/08/26 18:15:37 christos Exp $ */ +/* $NetBSD: netgroup_mkdb.c,v 1.16 2007/12/15 19:44:56 perry Exp $ */ /* * Copyright (c) 1994 Christos Zoulas @@ -32,7 +32,7 @@ */ #include #ifndef lint -__RCSID("$NetBSD: netgroup_mkdb.c,v 1.15 2006/08/26 18:15:37 christos Exp $"); +__RCSID("$NetBSD: netgroup_mkdb.c,v 1.16 2007/12/15 19:44:56 perry Exp $"); #endif #include @@ -82,7 +82,7 @@ static DB *ng_reverse(DB *, size_t); static DB *ng_load(const char *); static void ng_write(DB *, DB *, int); static void ng_rwrite(DB *, DB *, int); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; #ifdef DEBUG_NG static int debug = 0; diff --git a/usr.sbin/paxctl/paxctl.c b/usr.sbin/paxctl/paxctl.c index 101aa9c40220..f8e0508083ac 100644 --- a/usr.sbin/paxctl/paxctl.c +++ b/usr.sbin/paxctl/paxctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: paxctl.c,v 1.4 2007/12/11 01:40:27 christos Exp $ */ +/* $NetBSD: paxctl.c,v 1.5 2007/12/15 19:44:56 perry Exp $ */ /*- * Copyright (c) 2006 Elad Efrat @@ -33,7 +33,7 @@ #include #ifndef lint #ifdef __RCSID -__RCSID("$NetBSD: paxctl.c,v 1.4 2007/12/11 01:40:27 christos Exp $"); +__RCSID("$NetBSD: paxctl.c,v 1.5 2007/12/15 19:44:56 perry Exp $"); #endif #endif /* not lint */ @@ -50,7 +50,7 @@ __RCSID("$NetBSD: paxctl.c,v 1.4 2007/12/11 01:40:27 christos Exp $"); #include #include -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static int pax_flag(const char *); static int pax_flags_sane(u_long); static int pax_haveflags(u_long); diff --git a/usr.sbin/powerd/powerd.c b/usr.sbin/powerd/powerd.c index bbd11aaab302..34c6a2bc0e69 100644 --- a/usr.sbin/powerd/powerd.c +++ b/usr.sbin/powerd/powerd.c @@ -1,4 +1,4 @@ -/* $NetBSD: powerd.c,v 1.12 2007/10/06 22:12:04 xtraeme Exp $ */ +/* $NetBSD: powerd.c,v 1.13 2007/12/15 19:44:56 perry Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -61,7 +61,7 @@ static int kq; #define _PATH_DEV_POWER "/dev/power" #define _PATH_POWERD_SCRIPTS "/etc/powerd/scripts" -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static void run_script(const char *[]); static struct kevent *allocchange(void); static int wait_for_events(struct kevent *, size_t); diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c index 9146b6fd5c41..0368a7f62a80 100644 --- a/usr.sbin/rpc.lockd/lockd.c +++ b/usr.sbin/rpc.lockd/lockd.c @@ -1,4 +1,4 @@ -/* $NetBSD: lockd.c,v 1.9 2007/11/04 23:12:50 christos Exp $ */ +/* $NetBSD: lockd.c,v 1.10 2007/12/15 19:44:56 perry Exp $ */ /* * Copyright (c) 1995 @@ -35,7 +35,7 @@ #include #ifndef lint -__RCSID("$NetBSD: lockd.c,v 1.9 2007/11/04 23:12:50 christos Exp $"); +__RCSID("$NetBSD: lockd.c,v 1.10 2007/12/15 19:44:56 perry Exp $"); #endif /* @@ -74,7 +74,7 @@ void nlm_prog_0(struct svc_req *, SVCXPRT *); void nlm_prog_1(struct svc_req *, SVCXPRT *); void nlm_prog_3(struct svc_req *, SVCXPRT *); void nlm_prog_4(struct svc_req *, SVCXPRT *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static void sigalarm_handler(int); diff --git a/usr.sbin/rpc.statd/statd.c b/usr.sbin/rpc.statd/statd.c index 24d3c8575a20..6a612fdbcd1b 100644 --- a/usr.sbin/rpc.statd/statd.c +++ b/usr.sbin/rpc.statd/statd.c @@ -1,4 +1,4 @@ -/* $NetBSD: statd.c,v 1.27 2006/03/28 15:21:00 tron Exp $ */ +/* $NetBSD: statd.c,v 1.28 2007/12/15 19:44:56 perry Exp $ */ /* * Copyright (c) 1997 Christos Zoulas. All rights reserved. @@ -37,7 +37,7 @@ #include #ifndef lint -__RCSID("$NetBSD: statd.c,v 1.27 2006/03/28 15:21:00 tron Exp $"); +__RCSID("$NetBSD: statd.c,v 1.28 2007/12/15 19:44:56 perry Exp $"); #endif /* main() function for status monitor daemon. Some of the code in this */ @@ -88,7 +88,7 @@ static int unmon_host __P((DBT *, HostInfo *, void *)); static int notify_one __P((DBT *, HostInfo *, void *)); static void init_file __P((char *)); static int notify_one_host __P((char *)); -static void die __P((int)) __attribute__((__noreturn__)); +static void die __P((int)) __dead; int main __P((int, char **)); diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c index 55662fb2309c..0dbb207dec12 100644 --- a/usr.sbin/rwhod/rwhod.c +++ b/usr.sbin/rwhod/rwhod.c @@ -1,4 +1,4 @@ -/* $NetBSD: rwhod.c,v 1.34 2006/05/11 08:40:28 mrg Exp $ */ +/* $NetBSD: rwhod.c,v 1.35 2007/12/15 19:44:56 perry Exp $ */ /* * Copyright (c) 1983, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\ #if 0 static char sccsid[] = "@(#)rwhod.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: rwhod.c,v 1.34 2006/05/11 08:40:28 mrg Exp $"); +__RCSID("$NetBSD: rwhod.c,v 1.35 2007/12/15 19:44:56 perry Exp $"); #endif #endif /* not lint */ @@ -109,7 +109,7 @@ static void handleread(int); static void quit(const char *); static void rt_xaddrs(void *, void *, struct rt_addrinfo *); static int drop_privs(char *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static int verify(const char *); #ifdef DEBUG static char *interval(int, const char *); diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c index 73d106250e3e..6bb27cb3646e 100644 --- a/usr.sbin/sa/main.c +++ b/usr.sbin/sa/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.20 2004/10/30 15:40:57 dsl Exp $ */ +/* $NetBSD: main.c,v 1.21 2007/12/15 19:44:56 perry Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1994 Christopher G. Demetriou\n\ All rights reserved.\n"); -__RCSID("$NetBSD: main.c,v 1.20 2004/10/30 15:40:57 dsl Exp $"); +__RCSID("$NetBSD: main.c,v 1.21 2007/12/15 19:44:56 perry Exp $"); #endif /* @@ -70,7 +70,7 @@ static int cmp_avgdkio __P((const DBT *, const DBT *)); static int cmp_cpumem __P((const DBT *, const DBT *)); static int cmp_avgcpumem __P((const DBT *, const DBT *)); static int cmp_calls __P((const DBT *, const DBT *)); -static void usage __P((void)) __attribute__((__noreturn__)); +static void usage __P((void)) __dead; int aflag, bflag, cflag, dflag, Dflag, fflag, iflag, jflag, kflag; int Kflag, lflag, mflag, qflag, rflag, sflag, tflag, uflag, vflag; diff --git a/usr.sbin/services_mkdb/services_mkdb.c b/usr.sbin/services_mkdb/services_mkdb.c index 2a71f9c063a7..65f2c4f61124 100644 --- a/usr.sbin/services_mkdb/services_mkdb.c +++ b/usr.sbin/services_mkdb/services_mkdb.c @@ -1,4 +1,4 @@ -/* $NetBSD: services_mkdb.c,v 1.11 2007/06/23 17:02:03 christos Exp $ */ +/* $NetBSD: services_mkdb.c,v 1.12 2007/12/15 19:44:56 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include #ifndef lint -__RCSID("$NetBSD: services_mkdb.c,v 1.11 2007/06/23 17:02:03 christos Exp $"); +__RCSID("$NetBSD: services_mkdb.c,v 1.12 2007/12/15 19:44:56 perry Exp $"); #endif /* not lint */ #include @@ -73,7 +73,7 @@ static char *getstring(const char *, size_t, char **, const char *); static size_t getprotoindex(StringList *, const char *); static const char *getprotostr(StringList *, size_t); static const char *mkaliases(StringList *, char *, size_t); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; const HASHINFO hinfo = { .bsize = 256, diff --git a/usr.sbin/sunlabel/sunlabel.c b/usr.sbin/sunlabel/sunlabel.c index 6745c02523d0..1dc0bfb6dc1e 100644 --- a/usr.sbin/sunlabel/sunlabel.c +++ b/usr.sbin/sunlabel/sunlabel.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunlabel.c,v 1.17 2005/12/24 21:35:57 perry Exp $ */ +/* $NetBSD: sunlabel.c,v 1.18 2007/12/15 19:44:57 perry Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: sunlabel.c,v 1.17 2005/12/24 21:35:57 perry Exp $"); +__RCSID("$NetBSD: sunlabel.c,v 1.18 2007/12/15 19:44:57 perry Exp $"); #endif #include @@ -288,7 +288,7 @@ setdisk(const char *s) errx(1, "Can't find device for disk `%s'", s); } -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static void usage(void) { @@ -927,7 +927,7 @@ update_spc(void) */ static int /*ARGSUSED*/ -print_ascii(struct field *f, int sofar __attribute__((__unused__))) +print_ascii(struct field *f, int sofar __unused) { printf("%s: %.128s\n", f->tag, (char *)f->loc); return 0; diff --git a/usr.sbin/wsconscfg/wsconscfg.c b/usr.sbin/wsconscfg/wsconscfg.c index 86fd467d9baa..03fa18ec4800 100644 --- a/usr.sbin/wsconscfg/wsconscfg.c +++ b/usr.sbin/wsconscfg/wsconscfg.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsconscfg.c,v 1.15 2007/12/15 16:32:07 perry Exp $ */ +/* $NetBSD: wsconscfg.c,v 1.16 2007/12/15 19:44:57 perry Exp $ */ /* * Copyright (c) 1999 @@ -47,7 +47,7 @@ #define DEFDEV "/dev/ttyEcfg" -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; int main(int, char **); static void diff --git a/usr.sbin/ypserv/ypserv/ypserv.c b/usr.sbin/ypserv/ypserv/ypserv.c index b5979b319ee2..669b1efc5f32 100644 --- a/usr.sbin/ypserv/ypserv/ypserv.c +++ b/usr.sbin/ypserv/ypserv/ypserv.c @@ -1,4 +1,4 @@ -/* $NetBSD: ypserv.c,v 1.20 2006/05/20 20:03:28 christos Exp $ */ +/* $NetBSD: ypserv.c,v 1.21 2007/12/15 19:44:57 perry Exp $ */ /* * Copyright (c) 1994 Mats O Jansson @@ -33,7 +33,7 @@ #include #ifndef lint -__RCSID("$NetBSD: ypserv.c,v 1.20 2006/05/20 20:03:28 christos Exp $"); +__RCSID("$NetBSD: ypserv.c,v 1.21 2007/12/15 19:44:57 perry Exp $"); #endif #include @@ -95,7 +95,7 @@ static struct bindsock { { AF_INET6, SOCK_STREAM, IPPROTO_TCP, "tcp6" }, }; -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static int bind_resv_port(int, sa_family_t, in_port_t); static void