Module Name: src
Committed By: dholland
Date: Sun May 24 19:18:45 UTC 2009
Modified Files:
src/games/trek: abandon.c attack.c autover.c capture.c check_out.c
checkcond.c compkl.c computer.c damage.c damaged.c dcrept.c
destruct.c dock.c dumpgame.c dumpme.c dumpssradio.c getcodi.c
getpar.c help.c impulse.c initquad.c kill.c klmove.c lose.c
lrscan.c main.c move.c nova.c out.c phaser.c play.c ram.c ranf.c
rest.c schedule.c score.c setup.c setwarp.c shield.c snova.c
srscan.c systemname.c torped.c visual.c warp.c win.c
Log Message:
ANSIfy function declarations. No object file diffs except for two functions
whose K&R declaration didn't fully match the prototype (char vs. int) and
the diff of the disassembly of those looks plausible.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/games/trek/abandon.c src/games/trek/capture.c \
src/games/trek/dcrept.c src/games/trek/dock.c src/games/trek/impulse.c \
src/games/trek/lose.c src/games/trek/lrscan.c src/games/trek/out.c \
src/games/trek/rest.c src/games/trek/schedule.c src/games/trek/setwarp.c \
src/games/trek/visual.c src/games/trek/win.c
cvs rdiff -u -r1.5 -r1.6 src/games/trek/attack.c src/games/trek/autover.c \
src/games/trek/check_out.c src/games/trek/checkcond.c \
src/games/trek/damaged.c src/games/trek/dumpme.c \
src/games/trek/dumpssradio.c src/games/trek/getcodi.c \
src/games/trek/initquad.c src/games/trek/klmove.c src/games/trek/ram.c \
src/games/trek/ranf.c src/games/trek/score.c src/games/trek/snova.c
cvs rdiff -u -r1.6 -r1.7 src/games/trek/compkl.c src/games/trek/damage.c \
src/games/trek/move.c src/games/trek/nova.c src/games/trek/srscan.c \
src/games/trek/systemname.c
cvs rdiff -u -r1.11 -r1.12 src/games/trek/computer.c \
src/games/trek/dumpgame.c
cvs rdiff -u -r1.8 -r1.9 src/games/trek/destruct.c src/games/trek/kill.c \
src/games/trek/shield.c src/games/trek/warp.c
cvs rdiff -u -r1.12 -r1.13 src/games/trek/getpar.c
cvs rdiff -u -r1.9 -r1.10 src/games/trek/help.c src/games/trek/play.c \
src/games/trek/torped.c
cvs rdiff -u -r1.13 -r1.14 src/games/trek/main.c
cvs rdiff -u -r1.10 -r1.11 src/games/trek/phaser.c src/games/trek/setup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/trek/abandon.c
diff -u src/games/trek/abandon.c:1.7 src/games/trek/abandon.c:1.8
--- src/games/trek/abandon.c:1.7 Sat Dec 15 19:44:44 2007
+++ src/games/trek/abandon.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: abandon.c,v 1.7 2007/12/15 19:44:44 perry Exp $ */
+/* $NetBSD: abandon.c,v 1.8 2009/05/24 19:18:44 dholland 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.7 2007/12/15 19:44:44 perry Exp $");
+__RCSID("$NetBSD: abandon.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -68,8 +68,7 @@
/*ARGSUSED*/
void
-abandon(v)
- int v __unused;
+abandon(int v __unused)
{
struct quad *q;
int i;
Index: src/games/trek/capture.c
diff -u src/games/trek/capture.c:1.7 src/games/trek/capture.c:1.8
--- src/games/trek/capture.c:1.7 Sat Dec 15 19:44:44 2007
+++ src/games/trek/capture.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: capture.c,v 1.7 2007/12/15 19:44:44 perry Exp $ */
+/* $NetBSD: capture.c,v 1.8 2009/05/24 19:18:44 dholland 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.7 2007/12/15 19:44:44 perry Exp $");
+__RCSID("$NetBSD: capture.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -57,8 +57,7 @@
/*ARGSUSED*/
void
-capture(v)
- int v __unused;
+capture(int v __unused)
{
int i;
struct kling *k;
@@ -124,7 +123,8 @@
** Cruddy, just takes one at random. Should ask the captain.
*/
-struct kling *selectklingon()
+struct kling *
+selectklingon(void)
{
int i;
Index: src/games/trek/dcrept.c
diff -u src/games/trek/dcrept.c:1.7 src/games/trek/dcrept.c:1.8
--- src/games/trek/dcrept.c:1.7 Sat Dec 15 19:44:44 2007
+++ src/games/trek/dcrept.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dcrept.c,v 1.7 2007/12/15 19:44:44 perry Exp $ */
+/* $NetBSD: dcrept.c,v 1.8 2009/05/24 19:18:44 dholland 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.7 2007/12/15 19:44:44 perry Exp $");
+__RCSID("$NetBSD: dcrept.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -55,8 +55,7 @@
/*ARGSUSED*/
void
-dcrept(v)
- int v __unused;
+dcrept(int v __unused)
{
int i, f;
double x;
Index: src/games/trek/dock.c
diff -u src/games/trek/dock.c:1.7 src/games/trek/dock.c:1.8
--- src/games/trek/dock.c:1.7 Sat Dec 15 19:44:44 2007
+++ src/games/trek/dock.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dock.c,v 1.7 2007/12/15 19:44:44 perry Exp $ */
+/* $NetBSD: dock.c,v 1.8 2009/05/24 19:18:44 dholland 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.7 2007/12/15 19:44:44 perry Exp $");
+__RCSID("$NetBSD: dock.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -58,8 +58,7 @@
/*ARGSUSED*/
void
-dock(v)
- int v __unused;
+dock(int v __unused)
{
int i, j;
int ok;
@@ -132,8 +131,7 @@
/*ARGSUSED*/
void
-undock(v)
- int v __unused;
+undock(int v __unused)
{
struct event *e;
int i;
Index: src/games/trek/impulse.c
diff -u src/games/trek/impulse.c:1.7 src/games/trek/impulse.c:1.8
--- src/games/trek/impulse.c:1.7 Sat Dec 15 19:44:44 2007
+++ src/games/trek/impulse.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: impulse.c,v 1.7 2007/12/15 19:44:44 perry Exp $ */
+/* $NetBSD: impulse.c,v 1.8 2009/05/24 19:18:44 dholland 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.7 2007/12/15 19:44:44 perry Exp $");
+__RCSID("$NetBSD: impulse.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -48,8 +48,7 @@
/*ARGSUSED*/
void
-impulse(v)
- int v __unused;
+impulse(int v __unused)
{
int course;
int power;
Index: src/games/trek/lose.c
diff -u src/games/trek/lose.c:1.7 src/games/trek/lose.c:1.8
--- src/games/trek/lose.c:1.7 Thu Aug 7 09:37:52 2003
+++ src/games/trek/lose.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lose.c,v 1.7 2003/08/07 09:37:52 agc Exp $ */
+/* $NetBSD: lose.c,v 1.8 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)lose.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: lose.c,v 1.7 2003/08/07 09:37:52 agc Exp $");
+__RCSID("$NetBSD: lose.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -72,8 +72,7 @@
};
void
-lose(why)
-int why;
+lose(int why)
{
Game.killed = 1;
sleep(1);
Index: src/games/trek/lrscan.c
diff -u src/games/trek/lrscan.c:1.7 src/games/trek/lrscan.c:1.8
--- src/games/trek/lrscan.c:1.7 Sat Dec 15 19:44:44 2007
+++ src/games/trek/lrscan.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lrscan.c,v 1.7 2007/12/15 19:44:44 perry Exp $ */
+/* $NetBSD: lrscan.c,v 1.8 2009/05/24 19:18:44 dholland 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.7 2007/12/15 19:44:44 perry Exp $");
+__RCSID("$NetBSD: lrscan.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -55,8 +55,7 @@
/*ARGSUSED*/
void
-lrscan(v)
- int v __unused;
+lrscan(int v __unused)
{
int i, j;
struct quad *q;
Index: src/games/trek/out.c
diff -u src/games/trek/out.c:1.7 src/games/trek/out.c:1.8
--- src/games/trek/out.c:1.7 Thu Aug 7 09:37:53 2003
+++ src/games/trek/out.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: out.c,v 1.7 2003/08/07 09:37:53 agc Exp $ */
+/* $NetBSD: out.c,v 1.8 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)out.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: out.c,v 1.7 2003/08/07 09:37:53 agc Exp $");
+__RCSID("$NetBSD: out.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -47,8 +47,7 @@
*/
void
-out(dev)
-int dev;
+out(int dev)
{
const struct device *d;
Index: src/games/trek/rest.c
diff -u src/games/trek/rest.c:1.7 src/games/trek/rest.c:1.8
--- src/games/trek/rest.c:1.7 Sat Dec 15 19:44:45 2007
+++ src/games/trek/rest.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rest.c,v 1.7 2007/12/15 19:44:45 perry Exp $ */
+/* $NetBSD: rest.c,v 1.8 2009/05/24 19:18:44 dholland 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.7 2007/12/15 19:44:45 perry Exp $");
+__RCSID("$NetBSD: rest.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -58,8 +58,7 @@
/*ARGSUSED*/
void
-rest(v)
- int v __unused;
+rest(int v __unused)
{
double t;
int percent;
Index: src/games/trek/schedule.c
diff -u src/games/trek/schedule.c:1.7 src/games/trek/schedule.c:1.8
--- src/games/trek/schedule.c:1.7 Tue Mar 31 18:48:16 2009
+++ src/games/trek/schedule.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: schedule.c,v 1.7 2009/03/31 18:48:16 christos Exp $ */
+/* $NetBSD: schedule.c,v 1.8 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)schedule.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: schedule.c,v 1.7 2009/03/31 18:48:16 christos Exp $");
+__RCSID("$NetBSD: schedule.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -54,11 +54,8 @@
** The address of the slot is returned.
*/
-struct event *schedule(type, offset, x, y, z)
-int type;
-double offset;
-char x, y;
-char z;
+struct event *
+schedule(int type, double offset, int x, int y, int z)
{
struct event *e;
int i;
@@ -96,9 +93,7 @@
*/
void
-reschedule(e1, offset)
-struct event *e1;
-double offset;
+reschedule(struct event *e1, double offset)
{
double date;
struct event *e;
@@ -123,8 +118,7 @@
*/
void
-unschedule(e1)
-struct event *e1;
+unschedule(struct event *e1)
{
struct event *e;
@@ -149,10 +143,8 @@
** figure.
*/
-struct event *xsched(ev1, factor, x, y, z)
-int ev1;
-int factor;
-int x, y, z;
+struct event *
+xsched(int ev1, int factor, int x, int y, int z)
{
int ev;
@@ -169,10 +161,7 @@
*/
void
-xresched(e1, ev1, factor)
-struct event *e1;
-int ev1;
-int factor;
+xresched(struct event *e1, int ev1, int factor)
{
int ev;
struct event *e;
Index: src/games/trek/setwarp.c
diff -u src/games/trek/setwarp.c:1.7 src/games/trek/setwarp.c:1.8
--- src/games/trek/setwarp.c:1.7 Sat Dec 15 19:44:45 2007
+++ src/games/trek/setwarp.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: setwarp.c,v 1.7 2007/12/15 19:44:45 perry Exp $ */
+/* $NetBSD: setwarp.c,v 1.8 2009/05/24 19:18:44 dholland 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.7 2007/12/15 19:44:45 perry Exp $");
+__RCSID("$NetBSD: setwarp.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -51,8 +51,7 @@
/*ARGSUSED*/
void
-setwarp(v)
- int v __unused;
+setwarp(int v __unused)
{
double warpfac;
Index: src/games/trek/visual.c
diff -u src/games/trek/visual.c:1.7 src/games/trek/visual.c:1.8
--- src/games/trek/visual.c:1.7 Sat Dec 15 19:44:45 2007
+++ src/games/trek/visual.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: visual.c,v 1.7 2007/12/15 19:44:45 perry Exp $ */
+/* $NetBSD: visual.c,v 1.8 2009/05/24 19:18:44 dholland 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.7 2007/12/15 19:44:45 perry Exp $");
+__RCSID("$NetBSD: visual.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -69,8 +69,7 @@
/*ARGSUSED*/
void
-visual(z)
- int z __unused;
+visual(int z __unused)
{
int ix, iy;
int co;
Index: src/games/trek/win.c
diff -u src/games/trek/win.c:1.7 src/games/trek/win.c:1.8
--- src/games/trek/win.c:1.7 Thu Aug 7 09:37:55 2003
+++ src/games/trek/win.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: win.c,v 1.7 2003/08/07 09:37:55 agc Exp $ */
+/* $NetBSD: win.c,v 1.8 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)win.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: win.c,v 1.7 2003/08/07 09:37:55 agc Exp $");
+__RCSID("$NetBSD: win.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -60,7 +60,7 @@
extern jmp_buf env;
void
-win()
+win(void)
{
long s;
const struct cvntab *p = NULL;
Index: src/games/trek/attack.c
diff -u src/games/trek/attack.c:1.5 src/games/trek/attack.c:1.6
--- src/games/trek/attack.c:1.5 Thu Aug 7 09:37:49 2003
+++ src/games/trek/attack.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: attack.c,v 1.5 2003/08/07 09:37:49 agc Exp $ */
+/* $NetBSD: attack.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)attack.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: attack.c,v 1.5 2003/08/07 09:37:49 agc Exp $");
+__RCSID("$NetBSD: attack.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -70,11 +70,12 @@
** entry for the particular device.
**
** Casualties can also occur.
+**
+** resting -- set if attack while resting
*/
void
-attack(resting)
-int resting; /* set if attack while resting */
+attack(int resting)
{
int hit, i, l;
int maxhit, tothit, shldabsb;
Index: src/games/trek/autover.c
diff -u src/games/trek/autover.c:1.5 src/games/trek/autover.c:1.6
--- src/games/trek/autover.c:1.5 Thu Aug 7 09:37:49 2003
+++ src/games/trek/autover.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: autover.c,v 1.5 2003/08/07 09:37:49 agc Exp $ */
+/* $NetBSD: autover.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)autover.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: autover.c,v 1.5 2003/08/07 09:37:49 agc Exp $");
+__RCSID("$NetBSD: autover.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -60,7 +60,7 @@
*/
void
-autover()
+autover(void)
{
double dist;
int course;
Index: src/games/trek/check_out.c
diff -u src/games/trek/check_out.c:1.5 src/games/trek/check_out.c:1.6
--- src/games/trek/check_out.c:1.5 Thu Aug 7 09:37:50 2003
+++ src/games/trek/check_out.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: check_out.c,v 1.5 2003/08/07 09:37:50 agc Exp $ */
+/* $NetBSD: check_out.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)check_out.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: check_out.c,v 1.5 2003/08/07 09:37:50 agc Exp $");
+__RCSID("$NetBSD: check_out.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -53,8 +53,7 @@
*/
int
-check_out(device)
-int device;
+check_out(int device)
{
int dev;
Index: src/games/trek/checkcond.c
diff -u src/games/trek/checkcond.c:1.5 src/games/trek/checkcond.c:1.6
--- src/games/trek/checkcond.c:1.5 Thu Aug 7 09:37:50 2003
+++ src/games/trek/checkcond.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: checkcond.c,v 1.5 2003/08/07 09:37:50 agc Exp $ */
+/* $NetBSD: checkcond.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)checkcond.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: checkcond.c,v 1.5 2003/08/07 09:37:50 agc Exp $");
+__RCSID("$NetBSD: checkcond.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -66,7 +66,7 @@
*/
void
-checkcond()
+checkcond(void)
{
/* see if we are still alive and well */
if (Ship.reserves < 0.0)
Index: src/games/trek/damaged.c
diff -u src/games/trek/damaged.c:1.5 src/games/trek/damaged.c:1.6
--- src/games/trek/damaged.c:1.5 Thu Aug 7 09:37:50 2003
+++ src/games/trek/damaged.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: damaged.c,v 1.5 2003/08/07 09:37:50 agc Exp $ */
+/* $NetBSD: damaged.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)damaged.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: damaged.c,v 1.5 2003/08/07 09:37:50 agc Exp $");
+__RCSID("$NetBSD: damaged.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -48,8 +48,7 @@
*/
int
-damaged(dev)
-int dev;
+damaged(int dev)
{
int d;
struct event *e;
Index: src/games/trek/dumpme.c
diff -u src/games/trek/dumpme.c:1.5 src/games/trek/dumpme.c:1.6
--- src/games/trek/dumpme.c:1.5 Thu Aug 7 09:37:51 2003
+++ src/games/trek/dumpme.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dumpme.c,v 1.5 2003/08/07 09:37:51 agc Exp $ */
+/* $NetBSD: dumpme.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dumpme.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: dumpme.c,v 1.5 2003/08/07 09:37:51 agc Exp $");
+__RCSID("$NetBSD: dumpme.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -54,8 +54,7 @@
*/
void
-dumpme(flag)
-int flag;
+dumpme(int flag)
{
int f;
double x;
Index: src/games/trek/dumpssradio.c
diff -u src/games/trek/dumpssradio.c:1.5 src/games/trek/dumpssradio.c:1.6
--- src/games/trek/dumpssradio.c:1.5 Thu Aug 7 09:37:51 2003
+++ src/games/trek/dumpssradio.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dumpssradio.c,v 1.5 2003/08/07 09:37:51 agc Exp $ */
+/* $NetBSD: dumpssradio.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dumpssradio.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: dumpssradio.c,v 1.5 2003/08/07 09:37:51 agc Exp $");
+__RCSID("$NetBSD: dumpssradio.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -46,7 +46,7 @@
**/
int
-dumpssradio()
+dumpssradio(void)
{
struct event *e;
int j;
Index: src/games/trek/getcodi.c
diff -u src/games/trek/getcodi.c:1.5 src/games/trek/getcodi.c:1.6
--- src/games/trek/getcodi.c:1.5 Thu Aug 7 09:37:51 2003
+++ src/games/trek/getcodi.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: getcodi.c,v 1.5 2003/08/07 09:37:51 agc Exp $ */
+/* $NetBSD: getcodi.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getcodi.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: getcodi.c,v 1.5 2003/08/07 09:37:51 agc Exp $");
+__RCSID("$NetBSD: getcodi.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -52,9 +52,7 @@
*/
int
-getcodi(co, di)
-int *co;
-double *di;
+getcodi(int *co, double *di)
{
*co = getintpar("Course");
Index: src/games/trek/initquad.c
diff -u src/games/trek/initquad.c:1.5 src/games/trek/initquad.c:1.6
--- src/games/trek/initquad.c:1.5 Thu Aug 7 09:37:52 2003
+++ src/games/trek/initquad.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: initquad.c,v 1.5 2003/08/07 09:37:52 agc Exp $ */
+/* $NetBSD: initquad.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)initquad.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: initquad.c,v 1.5 2003/08/07 09:37:52 agc Exp $");
+__RCSID("$NetBSD: initquad.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -59,8 +59,7 @@
*/
void
-initquad(f)
-int f;
+initquad(int f)
{
int i, j;
int rx, ry;
@@ -142,8 +141,7 @@
void
-sector(x, y)
-int *x, *y;
+sector(int *x, int *y)
{
int i, j;
Index: src/games/trek/klmove.c
diff -u src/games/trek/klmove.c:1.5 src/games/trek/klmove.c:1.6
--- src/games/trek/klmove.c:1.5 Thu Aug 7 09:37:52 2003
+++ src/games/trek/klmove.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: klmove.c,v 1.5 2003/08/07 09:37:52 agc Exp $ */
+/* $NetBSD: klmove.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)klmove.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: klmove.c,v 1.5 2003/08/07 09:37:52 agc Exp $");
+__RCSID("$NetBSD: klmove.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -65,8 +65,7 @@
*/
void
-klmove(fl)
-int fl;
+klmove(int fl)
{
int n;
struct kling *k;
Index: src/games/trek/ram.c
diff -u src/games/trek/ram.c:1.5 src/games/trek/ram.c:1.6
--- src/games/trek/ram.c:1.5 Thu Aug 7 09:37:53 2003
+++ src/games/trek/ram.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ram.c,v 1.5 2003/08/07 09:37:53 agc Exp $ */
+/* $NetBSD: ram.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ram.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: ram.c,v 1.5 2003/08/07 09:37:53 agc Exp $");
+__RCSID("$NetBSD: ram.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -54,8 +54,7 @@
*/
void
-ram(ix, iy)
-int ix, iy;
+ram(int ix, int iy)
{
int i;
char c;
Index: src/games/trek/ranf.c
diff -u src/games/trek/ranf.c:1.5 src/games/trek/ranf.c:1.6
--- src/games/trek/ranf.c:1.5 Thu Aug 7 09:37:53 2003
+++ src/games/trek/ranf.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ranf.c,v 1.5 2003/08/07 09:37:53 agc Exp $ */
+/* $NetBSD: ranf.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ranf.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: ranf.c,v 1.5 2003/08/07 09:37:53 agc Exp $");
+__RCSID("$NetBSD: ranf.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -43,8 +43,7 @@
#include "trek.h"
int
-ranf(max)
-int max;
+ranf(int max)
{
int t;
@@ -55,7 +54,8 @@
}
-double franf()
+double
+franf(void)
{
double t;
t = rand() & 077777;
Index: src/games/trek/score.c
diff -u src/games/trek/score.c:1.5 src/games/trek/score.c:1.6
--- src/games/trek/score.c:1.5 Thu Aug 7 09:37:54 2003
+++ src/games/trek/score.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: score.c,v 1.5 2003/08/07 09:37:54 agc Exp $ */
+/* $NetBSD: score.c,v 1.6 2009/05/24 19:18:44 dholland 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.5 2003/08/07 09:37:54 agc Exp $");
+__RCSID("$NetBSD: score.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -46,7 +46,8 @@
** PRINT OUT THE CURRENT SCORE
*/
-long score()
+long
+score(void)
{
int u;
int t;
Index: src/games/trek/snova.c
diff -u src/games/trek/snova.c:1.5 src/games/trek/snova.c:1.6
--- src/games/trek/snova.c:1.5 Thu Aug 7 09:37:54 2003
+++ src/games/trek/snova.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: snova.c,v 1.5 2003/08/07 09:37:54 agc Exp $ */
+/* $NetBSD: snova.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)snova.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: snova.c,v 1.5 2003/08/07 09:37:54 agc Exp $");
+__RCSID("$NetBSD: snova.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -64,8 +64,7 @@
*/
void
-snova(x, y)
-int x, y;
+snova(int x, int y)
{
int qx, qy;
int ix, iy = 0;
Index: src/games/trek/compkl.c
diff -u src/games/trek/compkl.c:1.6 src/games/trek/compkl.c:1.7
--- src/games/trek/compkl.c:1.6 Tue Jan 27 20:30:30 2004
+++ src/games/trek/compkl.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: compkl.c,v 1.6 2004/01/27 20:30:30 jsm Exp $ */
+/* $NetBSD: compkl.c,v 1.7 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)compkl.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: compkl.c,v 1.6 2004/01/27 20:30:30 jsm Exp $");
+__RCSID("$NetBSD: compkl.c,v 1.7 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -50,13 +50,14 @@
**
** This routine is used every time the Enterprise or the Klingons
** move.
+**
+** f -- set if new quadrant
*/
static void sortkl(void);
void
-compkldist(f)
-int f; /* set if new quadrant */
+compkldist(int f)
{
int i, dx, dy;
double d;
@@ -98,7 +99,7 @@
*/
static void
-sortkl()
+sortkl(void)
{
struct kling t;
int f, i, m;
Index: src/games/trek/damage.c
diff -u src/games/trek/damage.c:1.6 src/games/trek/damage.c:1.7
--- src/games/trek/damage.c:1.6 Thu Aug 7 09:37:50 2003
+++ src/games/trek/damage.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: damage.c,v 1.6 2003/08/07 09:37:50 agc Exp $ */
+/* $NetBSD: damage.c,v 1.7 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)damage.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: damage.c,v 1.6 2003/08/07 09:37:50 agc Exp $");
+__RCSID("$NetBSD: damage.c,v 1.7 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -52,12 +52,13 @@
**
** Note that the repair of the device occurs on a DATE, meaning
** that the dock() and undock() have to reschedule the event.
+**
+** dev1 -- device index
+** dam -- time to repair
*/
void
-damage(dev1, dam)
-int dev1; /* device index */
-double dam; /* time to repair */
+damage(int dev1, double dam)
{
int i;
struct event *e;
Index: src/games/trek/move.c
diff -u src/games/trek/move.c:1.6 src/games/trek/move.c:1.7
--- src/games/trek/move.c:1.6 Thu Aug 7 09:37:52 2003
+++ src/games/trek/move.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: move.c,v 1.6 2003/08/07 09:37:52 agc Exp $ */
+/* $NetBSD: move.c,v 1.7 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: move.c,v 1.6 2003/08/07 09:37:52 agc Exp $");
+__RCSID("$NetBSD: move.c,v 1.7 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -77,11 +77,8 @@
** Uses trace flag 4.
*/
-double move(ramflag, course, time, speed)
-int ramflag;
-int course;
-double time;
-double speed;
+double
+move(int ramflag, int course, double time, double speed)
{
double angle;
double x, y, dx, dy;
Index: src/games/trek/nova.c
diff -u src/games/trek/nova.c:1.6 src/games/trek/nova.c:1.7
--- src/games/trek/nova.c:1.6 Thu Aug 7 09:37:53 2003
+++ src/games/trek/nova.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nova.c,v 1.6 2003/08/07 09:37:53 agc Exp $ */
+/* $NetBSD: nova.c,v 1.7 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)nova.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: nova.c,v 1.6 2003/08/07 09:37:53 agc Exp $");
+__RCSID("$NetBSD: nova.c,v 1.7 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -56,8 +56,7 @@
*/
void
-nova(x, y)
-int x, y;
+nova(int x, int y)
{
int i, j;
int se;
Index: src/games/trek/srscan.c
diff -u src/games/trek/srscan.c:1.6 src/games/trek/srscan.c:1.7
--- src/games/trek/srscan.c:1.6 Thu Aug 7 09:37:54 2003
+++ src/games/trek/srscan.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: srscan.c,v 1.6 2003/08/07 09:37:54 agc Exp $ */
+/* $NetBSD: srscan.c,v 1.7 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)srscan.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: srscan.c,v 1.6 2003/08/07 09:37:54 agc Exp $");
+__RCSID("$NetBSD: srscan.c,v 1.7 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -66,8 +66,7 @@
};
void
-srscan(f)
-int f;
+srscan(int f)
{
int i, j;
int statinfo;
Index: src/games/trek/systemname.c
diff -u src/games/trek/systemname.c:1.6 src/games/trek/systemname.c:1.7
--- src/games/trek/systemname.c:1.6 Thu Aug 7 09:37:54 2003
+++ src/games/trek/systemname.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: systemname.c,v 1.6 2003/08/07 09:37:54 agc Exp $ */
+/* $NetBSD: systemname.c,v 1.7 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)systemname.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: systemname.c,v 1.6 2003/08/07 09:37:54 agc Exp $");
+__RCSID("$NetBSD: systemname.c,v 1.7 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -51,8 +51,8 @@
** starsystems, etc.
*/
-const char *systemname(q1)
- const struct quad *q1;
+const char *
+systemname(const struct quad *q1)
{
const struct quad *q;
int i;
Index: src/games/trek/computer.c
diff -u src/games/trek/computer.c:1.11 src/games/trek/computer.c:1.12
--- src/games/trek/computer.c:1.11 Sat Dec 15 19:44:44 2007
+++ src/games/trek/computer.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: computer.c,v 1.11 2007/12/15 19:44:44 perry Exp $ */
+/* $NetBSD: computer.c,v 1.12 2009/05/24 19:18:44 dholland 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.11 2007/12/15 19:44:44 perry Exp $");
+__RCSID("$NetBSD: computer.c,v 1.12 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -109,8 +109,7 @@
/*ARGSUSED*/
void
-computer(v)
- int v __unused;
+computer(int v __unused)
{
int ix, iy;
int i, j;
@@ -317,12 +316,7 @@
*/
static int
-kalc(tqx, tqy, tsx, tsy, dist)
-int tqx;
-int tqy;
-int tsx;
-int tsy;
-double *dist;
+kalc(int tqx, int tqy, int tsx, int tsy, double *dist)
{
double dx, dy;
double quadsize;
@@ -347,9 +341,7 @@
}
static void
-prkalc(course, dist)
-int course;
-double dist;
+prkalc(int course, double dist)
{
printf(": course %d dist %.3f\n", course, dist);
}
Index: src/games/trek/dumpgame.c
diff -u src/games/trek/dumpgame.c:1.11 src/games/trek/dumpgame.c:1.12
--- src/games/trek/dumpgame.c:1.11 Sat Dec 15 19:44:44 2007
+++ src/games/trek/dumpgame.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dumpgame.c,v 1.11 2007/12/15 19:44:44 perry Exp $ */
+/* $NetBSD: dumpgame.c,v 1.12 2009/05/24 19:18:44 dholland 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.11 2007/12/15 19:44:44 perry Exp $");
+__RCSID("$NetBSD: dumpgame.c,v 1.12 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -82,8 +82,7 @@
/*ARGSUSED*/
void
-dumpgame(v)
- int v __unused;
+dumpgame(int v __unused)
{
int version;
int fd;
@@ -121,7 +120,7 @@
*/
int
-restartgame()
+restartgame(void)
{
int fd;
int version;
@@ -152,8 +151,7 @@
*/
static int
-readdump(fd1)
-int fd1;
+readdump(int fd1)
{
int fd;
struct dump *d;
Index: src/games/trek/destruct.c
diff -u src/games/trek/destruct.c:1.8 src/games/trek/destruct.c:1.9
--- src/games/trek/destruct.c:1.8 Sat Dec 15 19:44:44 2007
+++ src/games/trek/destruct.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: destruct.c,v 1.8 2007/12/15 19:44:44 perry Exp $ */
+/* $NetBSD: destruct.c,v 1.9 2009/05/24 19:18:44 dholland 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.8 2007/12/15 19:44:44 perry Exp $");
+__RCSID("$NetBSD: destruct.c,v 1.9 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -66,8 +66,7 @@
/*ARGSUSED*/
void
-destruct(v)
- int v __unused;
+destruct(int v __unused)
{
char checkpass[15];
int i, j;
Index: src/games/trek/kill.c
diff -u src/games/trek/kill.c:1.8 src/games/trek/kill.c:1.9
--- src/games/trek/kill.c:1.8 Tue Mar 31 18:48:16 2009
+++ src/games/trek/kill.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kill.c,v 1.8 2009/03/31 18:48:16 christos Exp $ */
+/* $NetBSD: kill.c,v 1.9 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)kill.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: kill.c,v 1.8 2009/03/31 18:48:16 christos Exp $");
+__RCSID("$NetBSD: kill.c,v 1.9 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -59,8 +59,7 @@
*/
void
-killk(ix, iy)
-int ix, iy;
+killk(int ix, int iy)
{
int i;
@@ -100,8 +99,7 @@
*/
void
-killb(qx, qy)
-int qx, qy;
+killb(int qx, int qy)
{
struct quad *q;
struct xy *b;
@@ -146,12 +144,13 @@
/**
** kill an inhabited starsystem
+ **
+ ** x, y are quad coords if f == 0, else sector coords
+ ** f != 0 -- this quad; f < 0 -- Enterprise's fault
**/
void
-kills(x, y, f)
-int x, y; /* quad coords if f == 0, else sector coords */
-int f; /* f != 0 -- this quad; f < 0 -- Enterprise's fault */
+kills(int x, int y, int f)
{
struct quad *q;
struct event *e;
@@ -190,12 +189,13 @@
/**
** "kill" a distress call
+ **
+ ** x, y are quadrant coordinates
+ ** f is set if user is to be informed
**/
void
-killd(x, y, f)
-int x, y; /* quadrant coordinates */
-int f; /* set if user is to be informed */
+killd(int x, int y, int f)
{
struct event *e;
int i;
Index: src/games/trek/shield.c
diff -u src/games/trek/shield.c:1.8 src/games/trek/shield.c:1.9
--- src/games/trek/shield.c:1.8 Thu Aug 7 09:37:54 2003
+++ src/games/trek/shield.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: shield.c,v 1.8 2003/08/07 09:37:54 agc Exp $ */
+/* $NetBSD: shield.c,v 1.9 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)shield.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: shield.c,v 1.8 2003/08/07 09:37:54 agc Exp $");
+__RCSID("$NetBSD: shield.c,v 1.9 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -67,8 +67,7 @@
};
void
-shield(f)
-int f;
+shield(int f)
{
int i;
const struct cvntab *r;
Index: src/games/trek/warp.c
diff -u src/games/trek/warp.c:1.8 src/games/trek/warp.c:1.9
--- src/games/trek/warp.c:1.8 Thu Aug 7 09:37:55 2003
+++ src/games/trek/warp.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: warp.c,v 1.8 2003/08/07 09:37:55 agc Exp $ */
+/* $NetBSD: warp.c,v 1.9 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)warp.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: warp.c,v 1.8 2003/08/07 09:37:55 agc Exp $");
+__RCSID("$NetBSD: warp.c,v 1.9 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -62,8 +62,7 @@
*/
void
-dowarp(fl)
- int fl;
+dowarp(int fl)
{
int c;
double d;
@@ -74,9 +73,7 @@
}
void
-warp(fl, c, d)
-int fl, c;
-double d;
+warp(int fl, int c, double d)
{
char *p;
int course;
Index: src/games/trek/getpar.c
diff -u src/games/trek/getpar.c:1.12 src/games/trek/getpar.c:1.13
--- src/games/trek/getpar.c:1.12 Tue Jan 27 20:30:31 2004
+++ src/games/trek/getpar.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: getpar.c,v 1.12 2004/01/27 20:30:31 jsm Exp $ */
+/* $NetBSD: getpar.c,v 1.13 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getpar.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: getpar.c,v 1.12 2004/01/27 20:30:31 jsm Exp $");
+__RCSID("$NetBSD: getpar.c,v 1.13 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -51,8 +51,7 @@
**/
int
-getintpar(s)
- const char *s;
+getintpar(const char *s)
{
int i;
int n;
@@ -75,8 +74,8 @@
** get floating parameter
**/
-double getfltpar(s)
- const char *s;
+double
+getfltpar(const char *s)
{
int i;
double d;
@@ -107,8 +106,7 @@
};
int
-getynpar(s)
- const char *s;
+getynpar(const char *s)
{
const struct cvntab *r;
@@ -121,9 +119,8 @@
** get coded parameter
**/
-const struct cvntab *getcodpar(s, tab)
- const char *s;
- const struct cvntab tab[];
+const struct cvntab *
+getcodpar(const char *s, const struct cvntab tab[])
{
char input[100];
const struct cvntab *r;
@@ -200,11 +197,7 @@
**/
void
-getstrpar(s, r, l, t)
- const char *s;
- char *r;
- int l;
- const char *t;
+getstrpar(const char *s, char *r, int l, const char *t)
{
int i;
char format[20];
@@ -234,7 +227,7 @@
**/
int
-testnl()
+testnl(void)
{
char c;
@@ -256,8 +249,7 @@
**/
void
-skiptonl(c)
-int c;
+skiptonl(int c)
{
while (c != '\n')
if (!(c = cgetc(0)))
@@ -272,7 +264,7 @@
**/
static int
-testterm()
+testterm(void)
{
char c;
@@ -295,8 +287,7 @@
*/
int
-readdelim(d)
-char d;
+readdelim(int d)
{
char c;
Index: src/games/trek/help.c
diff -u src/games/trek/help.c:1.9 src/games/trek/help.c:1.10
--- src/games/trek/help.c:1.9 Tue Mar 31 18:48:16 2009
+++ src/games/trek/help.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: help.c,v 1.9 2009/03/31 18:48:16 christos Exp $ */
+/* $NetBSD: help.c,v 1.10 2009/05/24 19:18:44 dholland 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.9 2009/03/31 18:48:16 christos Exp $");
+__RCSID("$NetBSD: help.c,v 1.10 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -69,8 +69,7 @@
/*ARGSUSED*/
void
-help(v)
- int v __unused;
+help(int v __unused)
{
int i;
double dist, x;
Index: src/games/trek/play.c
diff -u src/games/trek/play.c:1.9 src/games/trek/play.c:1.10
--- src/games/trek/play.c:1.9 Sat Dec 15 19:44:45 2007
+++ src/games/trek/play.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: play.c,v 1.9 2007/12/15 19:44:45 perry Exp $ */
+/* $NetBSD: play.c,v 1.10 2009/05/24 19:18:44 dholland 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.9 2007/12/15 19:44:45 perry Exp $");
+__RCSID("$NetBSD: play.c,v 1.10 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -86,15 +86,14 @@
/*ARGSUSED*/
void
-myreset(v)
- int v __unused;
+myreset(int v __unused)
{
longjmp(env, 1);
}
void
-play()
+play(void)
{
const struct cvntab *r;
Index: src/games/trek/torped.c
diff -u src/games/trek/torped.c:1.9 src/games/trek/torped.c:1.10
--- src/games/trek/torped.c:1.9 Sat Dec 15 19:44:45 2007
+++ src/games/trek/torped.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: torped.c,v 1.9 2007/12/15 19:44:45 perry Exp $ */
+/* $NetBSD: torped.c,v 1.10 2009/05/24 19:18:44 dholland 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.9 2007/12/15 19:44:45 perry Exp $");
+__RCSID("$NetBSD: torped.c,v 1.10 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -67,8 +67,7 @@
/*ARGSUSED*/
void
-torped(v)
- int v __unused;
+torped(int v __unused)
{
int ix, iy;
double x, y, dx, dy;
@@ -230,8 +229,7 @@
*/
static int
-randcourse(n)
-int n;
+randcourse(int n)
{
double r;
int d;
Index: src/games/trek/main.c
diff -u src/games/trek/main.c:1.13 src/games/trek/main.c:1.14
--- src/games/trek/main.c:1.13 Sun Jul 20 01:03:22 2008
+++ src/games/trek/main.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.13 2008/07/20 01:03:22 lukem Exp $ */
+/* $NetBSD: main.c,v 1.14 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: main.c,v 1.13 2008/07/20 01:03:22 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.14 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -160,9 +160,7 @@
int main(int, char **);
int
-main(argc, argv)
-int argc;
-char **argv;
+main(int argc, char **argv)
{
time_t curtime;
long vect;
Index: src/games/trek/phaser.c
diff -u src/games/trek/phaser.c:1.10 src/games/trek/phaser.c:1.11
--- src/games/trek/phaser.c:1.10 Sat Dec 15 19:44:44 2007
+++ src/games/trek/phaser.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: phaser.c,v 1.10 2007/12/15 19:44:44 perry Exp $ */
+/* $NetBSD: phaser.c,v 1.11 2009/05/24 19:18:44 dholland 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.10 2007/12/15 19:44:44 perry Exp $");
+__RCSID("$NetBSD: phaser.c,v 1.11 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -94,8 +94,7 @@
/*ARGSUSED*/
void
-phaser(v)
- int v __unused;
+phaser(int v __unused)
{
int i;
int j;
Index: src/games/trek/setup.c
diff -u src/games/trek/setup.c:1.10 src/games/trek/setup.c:1.11
--- src/games/trek/setup.c:1.10 Tue Mar 31 18:48:16 2009
+++ src/games/trek/setup.c Sun May 24 19:18:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.10 2009/03/31 18:48:16 christos Exp $ */
+/* $NetBSD: setup.c,v 1.11 2009/05/24 19:18:44 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)setup.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: setup.c,v 1.10 2009/03/31 18:48:16 christos Exp $");
+__RCSID("$NetBSD: setup.c,v 1.11 2009/05/24 19:18:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -80,7 +80,7 @@
};
void
-setup()
+setup(void)
{
const struct cvntab *r;
int i, j;
