diff options
author | jsm <jsm@NetBSD.org> | 1999-09-08 21:45:25 +0000 |
---|---|---|
committer | jsm <jsm@NetBSD.org> | 1999-09-08 21:45:25 +0000 |
commit | 82852318e37fa7eddacc3dd162a2d16d3a7487b9 (patch) | |
tree | ba4e5f04137e24700deb25aaa5abefb172b8c030 /trek | |
parent | 04f4d7044367099914cf1906ae27ac20c24e44cf (diff) | |
download | bsdgames-darwin-82852318e37fa7eddacc3dd162a2d16d3a7487b9.tar.gz bsdgames-darwin-82852318e37fa7eddacc3dd162a2d16d3a7487b9.tar.zst bsdgames-darwin-82852318e37fa7eddacc3dd162a2d16d3a7487b9.zip |
Add `__noreturn__' and `__unused__' attributes where appropriate to
the games.
This merges in all such remaining changes from the Linux port of the
NetBSD games, except in hunt (where substantial changes from OpenBSD
need to be looked at).
Most noreturn attributes were previously added in bin/6144, with some
others that were missed then in bin/8082. Previous `unused'
attributes were covered in bin/6557, bin/8058 and other PRs (all these
PRs have already been handled and closed).
Diffstat (limited to 'trek')
-rw-r--r-- | trek/abandon.c | 6 | ||||
-rw-r--r-- | trek/capture.c | 6 | ||||
-rw-r--r-- | trek/cgetc.c | 6 | ||||
-rw-r--r-- | trek/computer.c | 6 | ||||
-rw-r--r-- | trek/dcrept.c | 6 | ||||
-rw-r--r-- | trek/destruct.c | 6 | ||||
-rw-r--r-- | trek/dock.c | 8 | ||||
-rw-r--r-- | trek/dumpgame.c | 6 | ||||
-rw-r--r-- | trek/help.c | 6 | ||||
-rw-r--r-- | trek/impulse.c | 6 | ||||
-rw-r--r-- | trek/lrscan.c | 6 | ||||
-rw-r--r-- | trek/phaser.c | 6 | ||||
-rw-r--r-- | trek/play.c | 6 | ||||
-rw-r--r-- | trek/rest.c | 6 | ||||
-rw-r--r-- | trek/setwarp.c | 6 | ||||
-rw-r--r-- | trek/torped.c | 6 | ||||
-rw-r--r-- | trek/trek.h | 10 | ||||
-rw-r--r-- | trek/visual.c | 6 |
18 files changed, 57 insertions, 57 deletions
diff --git a/trek/abandon.c b/trek/abandon.c index 9b872564..872d15d1 100644 --- a/trek/abandon.c +++ b/trek/abandon.c @@ -1,4 +1,4 @@ -/* $NetBSD: abandon.c,v 1.4 1997/10/12 21:24:25 christos Exp $ */ +/* $NetBSD: abandon.c,v 1.5 1999/09/08 21:45:32 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)abandon.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: abandon.c,v 1.4 1997/10/12 21:24:25 christos Exp $"); +__RCSID("$NetBSD: abandon.c,v 1.5 1999/09/08 21:45:32 jsm Exp $"); #endif #endif /* not lint */ @@ -73,7 +73,7 @@ __RCSID("$NetBSD: abandon.c,v 1.4 1997/10/12 21:24:25 christos Exp $"); /*ARGSUSED*/ void abandon(v) - int v; + int v __attribute__((__unused__)); { struct quad *q; int i; diff --git a/trek/capture.c b/trek/capture.c index 1325b813..93a9d253 100644 --- a/trek/capture.c +++ b/trek/capture.c @@ -1,4 +1,4 @@ -/* $NetBSD: capture.c,v 1.4 1997/10/12 21:24:29 christos Exp $ */ +/* $NetBSD: capture.c,v 1.5 1999/09/08 21:45:32 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)capture.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: capture.c,v 1.4 1997/10/12 21:24:29 christos Exp $"); +__RCSID("$NetBSD: capture.c,v 1.5 1999/09/08 21:45:32 jsm Exp $"); #endif #endif /* not lint */ @@ -62,7 +62,7 @@ __RCSID("$NetBSD: capture.c,v 1.4 1997/10/12 21:24:29 christos Exp $"); /*ARGSUSED*/ void capture(v) - int v; + int v __attribute__((__unused__)); { int i; struct kling *k; diff --git a/trek/cgetc.c b/trek/cgetc.c index f1d4e0f7..19d8b855 100644 --- a/trek/cgetc.c +++ b/trek/cgetc.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgetc.c,v 1.4 1997/10/12 21:24:30 christos Exp $ */ +/* $NetBSD: cgetc.c,v 1.5 1999/09/08 21:45:32 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)cgetc.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: cgetc.c,v 1.4 1997/10/12 21:24:30 christos Exp $"); +__RCSID("$NetBSD: cgetc.c,v 1.5 1999/09/08 21:45:32 jsm Exp $"); #endif #endif /* not lint */ @@ -46,7 +46,7 @@ __RCSID("$NetBSD: cgetc.c,v 1.4 1997/10/12 21:24:30 christos Exp $"); # include "trek.h" char cgetc(i) -int i; +int i __attribute__((__unused__)); { return ( getchar() ); } diff --git a/trek/computer.c b/trek/computer.c index cb08ae6d..d6ebe9cb 100644 --- a/trek/computer.c +++ b/trek/computer.c @@ -1,4 +1,4 @@ -/* $NetBSD: computer.c,v 1.6 1999/07/21 13:19:10 hubertf Exp $ */ +/* $NetBSD: computer.c,v 1.7 1999/09/08 21:45:32 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)computer.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: computer.c,v 1.6 1999/07/21 13:19:10 hubertf Exp $"); +__RCSID("$NetBSD: computer.c,v 1.7 1999/09/08 21:45:32 jsm Exp $"); #endif #endif /* not lint */ @@ -113,7 +113,7 @@ static void prkalc __P((int, double)); /*ARGSUSED*/ void computer(v) - int v; + int v __attribute__((__unused__)); { int ix, iy; int i, j; diff --git a/trek/dcrept.c b/trek/dcrept.c index a01d4b2e..a3e6e55d 100644 --- a/trek/dcrept.c +++ b/trek/dcrept.c @@ -1,4 +1,4 @@ -/* $NetBSD: dcrept.c,v 1.4 1997/10/12 21:24:38 christos Exp $ */ +/* $NetBSD: dcrept.c,v 1.5 1999/09/08 21:45:32 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dcrept.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dcrept.c,v 1.4 1997/10/12 21:24:38 christos Exp $"); +__RCSID("$NetBSD: dcrept.c,v 1.5 1999/09/08 21:45:32 jsm Exp $"); #endif #endif /* not lint */ @@ -60,7 +60,7 @@ __RCSID("$NetBSD: dcrept.c,v 1.4 1997/10/12 21:24:38 christos Exp $"); /*ARGSUSED*/ void dcrept(v) - int v; + int v __attribute__((__unused__)); { int i, f; double x; diff --git a/trek/destruct.c b/trek/destruct.c index 86799d27..eac87c53 100644 --- a/trek/destruct.c +++ b/trek/destruct.c @@ -1,4 +1,4 @@ -/* $NetBSD: destruct.c,v 1.4 1997/10/12 21:24:40 christos Exp $ */ +/* $NetBSD: destruct.c,v 1.5 1999/09/08 21:45:32 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)destruct.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: destruct.c,v 1.4 1997/10/12 21:24:40 christos Exp $"); +__RCSID("$NetBSD: destruct.c,v 1.5 1999/09/08 21:45:32 jsm Exp $"); #endif #endif /* not lint */ @@ -70,7 +70,7 @@ __RCSID("$NetBSD: destruct.c,v 1.4 1997/10/12 21:24:40 christos Exp $"); /*ARGSUSED*/ void destruct(v) - int v; + int v __attribute__((__unused__)); { char checkpass[15]; int i, j; diff --git a/trek/dock.c b/trek/dock.c index 74d1ea7c..5af80f9c 100644 --- a/trek/dock.c +++ b/trek/dock.c @@ -1,4 +1,4 @@ -/* $NetBSD: dock.c,v 1.4 1997/10/12 21:24:41 christos Exp $ */ +/* $NetBSD: dock.c,v 1.5 1999/09/08 21:45:32 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dock.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dock.c,v 1.4 1997/10/12 21:24:41 christos Exp $"); +__RCSID("$NetBSD: dock.c,v 1.5 1999/09/08 21:45:32 jsm Exp $"); #endif #endif /* not lint */ @@ -63,7 +63,7 @@ __RCSID("$NetBSD: dock.c,v 1.4 1997/10/12 21:24:41 christos Exp $"); /*ARGSUSED*/ void dock(v) - int v; + int v __attribute__((__unused__)); { int i, j; int ok; @@ -137,7 +137,7 @@ dock(v) /*ARGSUSED*/ void undock(v) - int v; + int v __attribute__((__unused__)); { struct event *e; int i; diff --git a/trek/dumpgame.c b/trek/dumpgame.c index 16207774..b9bd0503 100644 --- a/trek/dumpgame.c +++ b/trek/dumpgame.c @@ -1,4 +1,4 @@ -/* $NetBSD: dumpgame.c,v 1.6 1998/09/11 14:26:19 hubertf Exp $ */ +/* $NetBSD: dumpgame.c,v 1.7 1999/09/08 21:45:32 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dumpgame.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dumpgame.c,v 1.6 1998/09/11 14:26:19 hubertf Exp $"); +__RCSID("$NetBSD: dumpgame.c,v 1.7 1999/09/08 21:45:32 jsm Exp $"); #endif #endif /* not lint */ @@ -87,7 +87,7 @@ struct dump Dump_template[] = /*ARGSUSED*/ void dumpgame(v) - int v; + int v __attribute__((__unused__)); { int version; int fd; diff --git a/trek/help.c b/trek/help.c index d2696a22..41c9413b 100644 --- a/trek/help.c +++ b/trek/help.c @@ -1,4 +1,4 @@ -/* $NetBSD: help.c,v 1.5 1999/07/21 13:19:10 hubertf Exp $ */ +/* $NetBSD: help.c,v 1.6 1999/09/08 21:45:32 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)help.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: help.c,v 1.5 1999/07/21 13:19:10 hubertf Exp $"); +__RCSID("$NetBSD: help.c,v 1.6 1999/09/08 21:45:32 jsm Exp $"); #endif #endif /* not lint */ @@ -73,7 +73,7 @@ const char *const Cntvect[3] = /*ARGSUSED*/ void help(v) - int v; + int v __attribute__((__unused__)); { int i; double dist, x; diff --git a/trek/impulse.c b/trek/impulse.c index 490f52b7..cb4f08b3 100644 --- a/trek/impulse.c +++ b/trek/impulse.c @@ -1,4 +1,4 @@ -/* $NetBSD: impulse.c,v 1.4 1997/10/12 21:24:54 christos Exp $ */ +/* $NetBSD: impulse.c,v 1.5 1999/09/08 21:45:33 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)impulse.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: impulse.c,v 1.4 1997/10/12 21:24:54 christos Exp $"); +__RCSID("$NetBSD: impulse.c,v 1.5 1999/09/08 21:45:33 jsm Exp $"); #endif #endif /* not lint */ @@ -53,7 +53,7 @@ __RCSID("$NetBSD: impulse.c,v 1.4 1997/10/12 21:24:54 christos Exp $"); /*ARGSUSED*/ void impulse(v) - int v; + int v __attribute__((__unused__)); { int course; int power; diff --git a/trek/lrscan.c b/trek/lrscan.c index 178cc477..60569480 100644 --- a/trek/lrscan.c +++ b/trek/lrscan.c @@ -1,4 +1,4 @@ -/* $NetBSD: lrscan.c,v 1.4 1997/10/12 21:24:59 christos Exp $ */ +/* $NetBSD: lrscan.c,v 1.5 1999/09/08 21:45:33 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)lrscan.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: lrscan.c,v 1.4 1997/10/12 21:24:59 christos Exp $"); +__RCSID("$NetBSD: lrscan.c,v 1.5 1999/09/08 21:45:33 jsm Exp $"); #endif #endif /* not lint */ @@ -60,7 +60,7 @@ __RCSID("$NetBSD: lrscan.c,v 1.4 1997/10/12 21:24:59 christos Exp $"); /*ARGSUSED*/ void lrscan(v) - int v; + int v __attribute__((__unused__)); { int i, j; struct quad *q; diff --git a/trek/phaser.c b/trek/phaser.c index 8273fe8b..96ef5372 100644 --- a/trek/phaser.c +++ b/trek/phaser.c @@ -1,4 +1,4 @@ -/* $NetBSD: phaser.c,v 1.6 1999/07/21 13:19:11 hubertf Exp $ */ +/* $NetBSD: phaser.c,v 1.7 1999/09/08 21:45:33 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)phaser.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: phaser.c,v 1.6 1999/07/21 13:19:11 hubertf Exp $"); +__RCSID("$NetBSD: phaser.c,v 1.7 1999/09/08 21:45:33 jsm Exp $"); #endif #endif /* not lint */ @@ -99,7 +99,7 @@ struct banks /*ARGSUSED*/ void phaser(v) - int v; + int v __attribute__((__unused__)); { int i; int j; diff --git a/trek/play.c b/trek/play.c index fe1f2200..3fbeac20 100644 --- a/trek/play.c +++ b/trek/play.c @@ -1,4 +1,4 @@ -/* $NetBSD: play.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $ */ +/* $NetBSD: play.c,v 1.6 1999/09/08 21:45:33 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)play.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: play.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $"); +__RCSID("$NetBSD: play.c,v 1.6 1999/09/08 21:45:33 jsm Exp $"); #endif #endif /* not lint */ @@ -89,7 +89,7 @@ const struct cvntab Comtab[] = /*ARGSUSED*/ void myreset(v) - int v; + int v __attribute__((__unused__)); { extern jmp_buf env; diff --git a/trek/rest.c b/trek/rest.c index 216018b9..a2f8310e 100644 --- a/trek/rest.c +++ b/trek/rest.c @@ -1,4 +1,4 @@ -/* $NetBSD: rest.c,v 1.4 1997/10/12 21:25:10 christos Exp $ */ +/* $NetBSD: rest.c,v 1.5 1999/09/08 21:45:33 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)rest.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: rest.c,v 1.4 1997/10/12 21:25:10 christos Exp $"); +__RCSID("$NetBSD: rest.c,v 1.5 1999/09/08 21:45:33 jsm Exp $"); #endif #endif /* not lint */ @@ -63,7 +63,7 @@ __RCSID("$NetBSD: rest.c,v 1.4 1997/10/12 21:25:10 christos Exp $"); /*ARGSUSED*/ void rest(v) - int v; + int v __attribute__((__unused__)); { double t; int percent; diff --git a/trek/setwarp.c b/trek/setwarp.c index e42f5434..56ec60f4 100644 --- a/trek/setwarp.c +++ b/trek/setwarp.c @@ -1,4 +1,4 @@ -/* $NetBSD: setwarp.c,v 1.4 1997/10/12 21:25:16 christos Exp $ */ +/* $NetBSD: setwarp.c,v 1.5 1999/09/08 21:45:33 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)setwarp.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: setwarp.c,v 1.4 1997/10/12 21:25:16 christos Exp $"); +__RCSID("$NetBSD: setwarp.c,v 1.5 1999/09/08 21:45:33 jsm Exp $"); #endif #endif /* not lint */ @@ -56,7 +56,7 @@ __RCSID("$NetBSD: setwarp.c,v 1.4 1997/10/12 21:25:16 christos Exp $"); /*ARGSUSED*/ void setwarp(v) - int v; + int v __attribute__((__unused__)); { double warpfac; diff --git a/trek/torped.c b/trek/torped.c index 90f30982..b48199bb 100644 --- a/trek/torped.c +++ b/trek/torped.c @@ -1,4 +1,4 @@ -/* $NetBSD: torped.c,v 1.4 1997/10/12 21:25:22 christos Exp $ */ +/* $NetBSD: torped.c,v 1.5 1999/09/08 21:45:33 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)torped.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: torped.c,v 1.4 1997/10/12 21:25:22 christos Exp $"); +__RCSID("$NetBSD: torped.c,v 1.5 1999/09/08 21:45:33 jsm Exp $"); #endif #endif /* not lint */ @@ -71,7 +71,7 @@ static int randcourse __P((int)); /*ARGSUSED*/ void torped(v) - int v; + int v __attribute__((__unused__)); { int ix, iy; double x, y, dx, dy; diff --git a/trek/trek.h b/trek/trek.h index a5686e7e..db330782 100644 --- a/trek/trek.h +++ b/trek/trek.h @@ -1,4 +1,4 @@ -/* $NetBSD: trek.h,v 1.6 1999/07/21 13:19:11 hubertf Exp $ */ +/* $NetBSD: trek.h,v 1.7 1999/09/08 21:45:33 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -459,7 +459,7 @@ void killd __P((int, int , int)); void klmove __P((int)); /* lose.c */ -void lose __P((int)); +void lose __P((int)) __attribute__((__noreturn__)); /* lrscan.c */ void lrscan __P((int)); @@ -477,8 +477,8 @@ void out __P((int)); void phaser __P((int)); /* play.c */ -void myreset __P((int)); -void play __P((void)); +void myreset __P((int)) __attribute__((__noreturn__)); +void play __P((void)) __attribute__((__noreturn__)); /* ram.c */ void ram __P((int, int )); @@ -529,4 +529,4 @@ void dowarp __P((int)); void warp __P((int, int, double)); /* win.c */ -void win __P((void)); +void win __P((void)) __attribute__((__noreturn__)); diff --git a/trek/visual.c b/trek/visual.c index 5c61fbfa..26fd5b21 100644 --- a/trek/visual.c +++ b/trek/visual.c @@ -1,4 +1,4 @@ -/* $NetBSD: visual.c,v 1.4 1997/10/12 21:25:26 christos Exp $ */ +/* $NetBSD: visual.c,v 1.5 1999/09/08 21:45:33 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)visual.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: visual.c,v 1.4 1997/10/12 21:25:26 christos Exp $"); +__RCSID("$NetBSD: visual.c,v 1.5 1999/09/08 21:45:33 jsm Exp $"); #endif #endif /* not lint */ @@ -74,7 +74,7 @@ struct xy Visdelta[11] = /*ARGSUSED*/ void visual(z) - int z; + int z __attribute__((__unused__)); { int ix, iy; int co; |