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.
This commit is contained in:
dholland 2009-05-24 19:18:44 +00:00
parent 9d12d16c67
commit bf0917b6ae
46 changed files with 187 additions and 251 deletions

View File

@ -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 @@ __RCSID("$NetBSD: abandon.c,v 1.7 2007/12/15 19:44:44 perry Exp $");
/*ARGSUSED*/
void
abandon(v)
int v __unused;
abandon(int v __unused)
{
struct quad *q;
int i;

View File

@ -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 @@ __RCSID("$NetBSD: attack.c,v 1.5 2003/08/07 09:37:49 agc Exp $");
** 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;

View File

@ -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 @@ __RCSID("$NetBSD: autover.c,v 1.5 2003/08/07 09:37:49 agc Exp $");
*/
void
autover()
autover(void)
{
double dist;
int course;

View File

@ -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 @@ __RCSID("$NetBSD: capture.c,v 1.7 2007/12/15 19:44:44 perry Exp $");
/*ARGSUSED*/
void
capture(v)
int v __unused;
capture(int v __unused)
{
int i;
struct kling *k;
@ -124,7 +123,8 @@ capture(v)
** Cruddy, just takes one at random. Should ask the captain.
*/
struct kling *selectklingon()
struct kling *
selectklingon(void)
{
int i;

View File

@ -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 @@ __RCSID("$NetBSD: check_out.c,v 1.5 2003/08/07 09:37:50 agc Exp $");
*/
int
check_out(device)
int device;
check_out(int device)
{
int dev;

View File

@ -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 @@ __RCSID("$NetBSD: checkcond.c,v 1.5 2003/08/07 09:37:50 agc Exp $");
*/
void
checkcond()
checkcond(void)
{
/* see if we are still alive and well */
if (Ship.reserves < 0.0)

View File

@ -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 @@ __RCSID("$NetBSD: compkl.c,v 1.6 2004/01/27 20:30:30 jsm Exp $");
**
** 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 @@ int f; /* set if new quadrant */
*/
static void
sortkl()
sortkl(void)
{
struct kling t;
int f, i, m;

View File

@ -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 @@ static void prkalc(int, double);
/*ARGSUSED*/
void
computer(v)
int v __unused;
computer(int v __unused)
{
int ix, iy;
int i, j;
@ -317,12 +316,7 @@ computer(v)
*/
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 @@ double *dist;
}
static void
prkalc(course, dist)
int course;
double dist;
prkalc(int course, double dist)
{
printf(": course %d dist %.3f\n", course, dist);
}

View File

@ -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 @@ __RCSID("$NetBSD: damage.c,v 1.6 2003/08/07 09:37:50 agc Exp $");
**
** 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;

View File

@ -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 @@ __RCSID("$NetBSD: damaged.c,v 1.5 2003/08/07 09:37:50 agc Exp $");
*/
int
damaged(dev)
int dev;
damaged(int dev)
{
int d;
struct event *e;

View File

@ -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 @@ __RCSID("$NetBSD: dcrept.c,v 1.7 2007/12/15 19:44:44 perry Exp $");
/*ARGSUSED*/
void
dcrept(v)
int v __unused;
dcrept(int v __unused)
{
int i, f;
double x;

View File

@ -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 @@ __RCSID("$NetBSD: destruct.c,v 1.8 2007/12/15 19:44:44 perry Exp $");
/*ARGSUSED*/
void
destruct(v)
int v __unused;
destruct(int v __unused)
{
char checkpass[15];
int i, j;

View File

@ -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 @@ __RCSID("$NetBSD: dock.c,v 1.7 2007/12/15 19:44:44 perry Exp $");
/*ARGSUSED*/
void
dock(v)
int v __unused;
dock(int v __unused)
{
int i, j;
int ok;
@ -132,8 +131,7 @@ dock(v)
/*ARGSUSED*/
void
undock(v)
int v __unused;
undock(int v __unused)
{
struct event *e;
int i;

View File

@ -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 @@ struct dump Dump_template[] =
/*ARGSUSED*/
void
dumpgame(v)
int v __unused;
dumpgame(int v __unused)
{
int version;
int fd;
@ -121,7 +120,7 @@ dumpgame(v)
*/
int
restartgame()
restartgame(void)
{
int fd;
int version;
@ -152,8 +151,7 @@ restartgame()
*/
static int
readdump(fd1)
int fd1;
readdump(int fd1)
{
int fd;
struct dump *d;

View File

@ -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 @@ __RCSID("$NetBSD: dumpme.c,v 1.5 2003/08/07 09:37:51 agc Exp $");
*/
void
dumpme(flag)
int flag;
dumpme(int flag)
{
int f;
double x;

View File

@ -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 @@ __RCSID("$NetBSD: dumpssradio.c,v 1.5 2003/08/07 09:37:51 agc Exp $");
**/
int
dumpssradio()
dumpssradio(void)
{
struct event *e;
int j;

View File

@ -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 @@ __RCSID("$NetBSD: getcodi.c,v 1.5 2003/08/07 09:37:51 agc Exp $");
*/
int
getcodi(co, di)
int *co;
double *di;
getcodi(int *co, double *di)
{
*co = getintpar("Course");

View File

@ -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 @@ static int testterm(void);
**/
int
getintpar(s)
const char *s;
getintpar(const char *s)
{
int i;
int n;
@ -75,8 +74,8 @@ getintpar(s)
** get floating parameter
**/
double getfltpar(s)
const char *s;
double
getfltpar(const char *s)
{
int i;
double d;
@ -107,8 +106,7 @@ const struct cvntab Yntab[] =
};
int
getynpar(s)
const char *s;
getynpar(const char *s)
{
const struct cvntab *r;
@ -121,9 +119,8 @@ getynpar(s)
** 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 @@ const struct cvntab *getcodpar(s, tab)
**/
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 @@ getstrpar(s, r, l, t)
**/
int
testnl()
testnl(void)
{
char c;
@ -256,8 +249,7 @@ testnl()
**/
void
skiptonl(c)
int c;
skiptonl(int c)
{
while (c != '\n')
if (!(c = cgetc(0)))
@ -272,7 +264,7 @@ int c;
**/
static int
testterm()
testterm(void)
{
char c;
@ -295,8 +287,7 @@ testterm()
*/
int
readdelim(d)
char d;
readdelim(int d)
{
char c;

View File

@ -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 @@ const char *const Cntvect[3] =
/*ARGSUSED*/
void
help(v)
int v __unused;
help(int v __unused)
{
int i;
double dist, x;

View File

@ -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 @@ __RCSID("$NetBSD: impulse.c,v 1.7 2007/12/15 19:44:44 perry Exp $");
/*ARGSUSED*/
void
impulse(v)
int v __unused;
impulse(int v __unused)
{
int course;
int power;

View File

@ -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 @@ __RCSID("$NetBSD: initquad.c,v 1.5 2003/08/07 09:37:52 agc Exp $");
*/
void
initquad(f)
int f;
initquad(int f)
{
int i, j;
int rx, ry;
@ -142,8 +141,7 @@ int f;
void
sector(x, y)
int *x, *y;
sector(int *x, int *y)
{
int i, j;

View File

@ -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 @@ __RCSID("$NetBSD: kill.c,v 1.8 2009/03/31 18:48:16 christos Exp $");
*/
void
killk(ix, iy)
int ix, iy;
killk(int ix, int iy)
{
int i;
@ -100,8 +99,7 @@ int ix, iy;
*/
void
killb(qx, qy)
int qx, qy;
killb(int qx, int qy)
{
struct quad *q;
struct xy *b;
@ -146,12 +144,13 @@ int qx, qy;
/**
** 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 @@ int f; /* f != 0 -- this quad; f < 0 -- Enterprise's fault */
/**
** "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;

View File

@ -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 @@ __RCSID("$NetBSD: klmove.c,v 1.5 2003/08/07 09:37:52 agc Exp $");
*/
void
klmove(fl)
int fl;
klmove(int fl)
{
int n;
struct kling *k;

View File

@ -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 @@ const char *const Losemsg[] =
};
void
lose(why)
int why;
lose(int why)
{
Game.killed = 1;
sleep(1);

View File

@ -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 @@ __RCSID("$NetBSD: lrscan.c,v 1.7 2007/12/15 19:44:44 perry Exp $");
/*ARGSUSED*/
void
lrscan(v)
int v __unused;
lrscan(int v __unused)
{
int i, j;
struct quad *q;

View File

@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\
#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 @@ jmp_buf env;
int main(int, char **);
int
main(argc, argv)
int argc;
char **argv;
main(int argc, char **argv)
{
time_t curtime;
long vect;

View File

@ -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 @@ __RCSID("$NetBSD: move.c,v 1.6 2003/08/07 09:37:52 agc Exp $");
** 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;

View File

@ -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 @@ __RCSID("$NetBSD: nova.c,v 1.6 2003/08/07 09:37:53 agc Exp $");
*/
void
nova(x, y)
int x, y;
nova(int x, int y)
{
int i, j;
int se;

View File

@ -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 @@ __RCSID("$NetBSD: out.c,v 1.7 2003/08/07 09:37:53 agc Exp $");
*/
void
out(dev)
int dev;
out(int dev)
{
const struct device *d;

View File

@ -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 @@ struct banks
/*ARGSUSED*/
void
phaser(v)
int v __unused;
phaser(int v __unused)
{
int i;
int j;

View File

@ -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 @@ const struct cvntab Comtab[] =
/*ARGSUSED*/
void
myreset(v)
int v __unused;
myreset(int v __unused)
{
longjmp(env, 1);
}
void
play()
play(void)
{
const struct cvntab *r;

View File

@ -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 @@ __RCSID("$NetBSD: ram.c,v 1.5 2003/08/07 09:37:53 agc Exp $");
*/
void
ram(ix, iy)
int ix, iy;
ram(int ix, int iy)
{
int i;
char c;

View File

@ -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 @@ __RCSID("$NetBSD: ranf.c,v 1.5 2003/08/07 09:37:53 agc Exp $");
#include "trek.h"
int
ranf(max)
int max;
ranf(int max)
{
int t;
@ -55,7 +54,8 @@ int max;
}
double franf()
double
franf(void)
{
double t;
t = rand() & 077777;

View File

@ -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 @@ __RCSID("$NetBSD: rest.c,v 1.7 2007/12/15 19:44:45 perry Exp $");
/*ARGSUSED*/
void
rest(v)
int v __unused;
rest(int v __unused)
{
double t;
int percent;

View File

@ -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 @@ __RCSID("$NetBSD: schedule.c,v 1.7 2009/03/31 18:48:16 christos Exp $");
** 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 @@ char z;
*/
void
reschedule(e1, offset)
struct event *e1;
double offset;
reschedule(struct event *e1, double offset)
{
double date;
struct event *e;
@ -123,8 +118,7 @@ double offset;
*/
void
unschedule(e1)
struct event *e1;
unschedule(struct event *e1)
{
struct event *e;
@ -149,10 +143,8 @@ struct event *e1;
** 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 @@ int x, y, z;
*/
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;

View File

@ -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 @@ __RCSID("$NetBSD: score.c,v 1.5 2003/08/07 09:37:54 agc Exp $");
** PRINT OUT THE CURRENT SCORE
*/
long score()
long
score(void)
{
int u;
int t;

View File

@ -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 @@ const struct cvntab Skitab[] =
};
void
setup()
setup(void)
{
const struct cvntab *r;
int i, j;

View File

@ -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 @@ __RCSID("$NetBSD: setwarp.c,v 1.7 2007/12/15 19:44:45 perry Exp $");
/*ARGSUSED*/
void
setwarp(v)
int v __unused;
setwarp(int v __unused)
{
double warpfac;

View File

@ -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 @@ const struct cvntab Udtab[] =
};
void
shield(f)
int f;
shield(int f)
{
int i;
const struct cvntab *r;

View File

@ -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 @@ __RCSID("$NetBSD: snova.c,v 1.5 2003/08/07 09:37:54 agc Exp $");
*/
void
snova(x, y)
int x, y;
snova(int x, int y)
{
int qx, qy;
int ix, iy = 0;

View File

@ -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 @@ const char *const Color[4] =
};
void
srscan(f)
int f;
srscan(int f)
{
int i, j;
int statinfo;

View File

@ -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 @@ __RCSID("$NetBSD: systemname.c,v 1.6 2003/08/07 09:37:54 agc Exp $");
** starsystems, etc.
*/
const char *systemname(q1)
const struct quad *q1;
const char *
systemname(const struct quad *q1)
{
const struct quad *q;
int i;

View File

@ -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 @@ static int randcourse(int);
/*ARGSUSED*/
void
torped(v)
int v __unused;
torped(int v __unused)
{
int ix, iy;
double x, y, dx, dy;
@ -230,8 +229,7 @@ torped(v)
*/
static int
randcourse(n)
int n;
randcourse(int n)
{
double r;
int d;

View File

@ -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 @@ struct xy Visdelta[11] =
/*ARGSUSED*/
void
visual(z)
int z __unused;
visual(int z __unused)
{
int ix, iy;
int co;

View File

@ -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 @@ __RCSID("$NetBSD: warp.c,v 1.8 2003/08/07 09:37:55 agc Exp $");
*/
void
dowarp(fl)
int fl;
dowarp(int fl)
{
int c;
double d;
@ -74,9 +73,7 @@ dowarp(fl)
}
void
warp(fl, c, d)
int fl, c;
double d;
warp(int fl, int c, double d)
{
char *p;
int course;

View File

@ -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 @@ __RCSID("$NetBSD: win.c,v 1.7 2003/08/07 09:37:55 agc Exp $");
extern jmp_buf env;
void
win()
win(void)
{
long s;
const struct cvntab *p = NULL;