summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mille/end.c10
-rw-r--r--mille/init.c16
-rw-r--r--mille/mille.c12
-rw-r--r--mille/mille.h14
-rw-r--r--mille/misc.c21
-rw-r--r--mille/move.c43
-rw-r--r--mille/print.c19
-rw-r--r--mille/roll.c9
-rw-r--r--mille/save.c18
-rw-r--r--mille/types.c11
-rw-r--r--mille/varpush.c9
11 files changed, 87 insertions, 95 deletions
diff --git a/mille/end.c b/mille/end.c
index a8fb8aa6..236d287c 100644
--- a/mille/end.c
+++ b/mille/end.c
@@ -1,4 +1,4 @@
-/* $NetBSD: end.c,v 1.4 1995/03/24 05:01:30 cgd Exp $ */
+/* $NetBSD: end.c,v 1.5 1997/05/23 23:09:36 jtc Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)end.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: end.c,v 1.4 1995/03/24 05:01:30 cgd Exp $";
+static char rcsid[] = "$NetBSD: end.c,v 1.5 1997/05/23 23:09:36 jtc Exp $";
#endif
#endif /* not lint */
@@ -52,9 +52,9 @@ static char rcsid[] = "$NetBSD: end.c,v 1.4 1995/03/24 05:01:30 cgd Exp $";
* the end-of-games points to the user who deserves it (if any).
*/
finalscore(pp)
-reg PLAY *pp; {
-
- reg int temp, tot, num;
+register PLAY *pp;
+{
+ register int temp, tot, num;
if (pp->was_finished == Finished)
return;
diff --git a/mille/init.c b/mille/init.c
index 368862ad..2ca77be9 100644
--- a/mille/init.c
+++ b/mille/init.c
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.5 1995/03/24 05:01:40 cgd Exp $ */
+/* $NetBSD: init.c,v 1.6 1997/05/23 23:09:37 jtc Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: init.c,v 1.5 1995/03/24 05:01:40 cgd Exp $";
+static char rcsid[] = "$NetBSD: init.c,v 1.6 1997/05/23 23:09:37 jtc Exp $";
#endif
#endif /* not lint */
@@ -49,9 +49,9 @@ static char rcsid[] = "$NetBSD: init.c,v 1.5 1995/03/24 05:01:40 cgd Exp $";
init() {
- reg PLAY *pp;
- reg int i, j;
- reg CARD card;
+ register PLAY *pp;
+ register int i, j;
+ register CARD card;
bzero(Numseen, sizeof Numseen);
Numgos = 0;
@@ -92,8 +92,8 @@ init() {
shuffle() {
- reg int i, r;
- reg CARD temp;
+ register int i, r;
+ register CARD temp;
for (i = 0; i < DECK_SZ; i++) {
r = roll(1, DECK_SZ) - 1;
@@ -168,7 +168,7 @@ newboard() {
newscore() {
- reg int i, new;
+ register int i, new;
register PLAY *pp;
static int was_full = -1;
static int last_win = -1;
diff --git a/mille/mille.c b/mille/mille.c
index cc4a6ac8..6a6a0395 100644
--- a/mille/mille.c
+++ b/mille/mille.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mille.c,v 1.4 1995/03/24 05:01:48 cgd Exp $ */
+/* $NetBSD: mille.c,v 1.5 1997/05/23 23:09:38 jtc Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -43,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mille.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: mille.c,v 1.4 1995/03/24 05:01:48 cgd Exp $";
+static char rcsid[] = "$NetBSD: mille.c,v 1.5 1997/05/23 23:09:38 jtc Exp $";
#endif
#endif /* not lint */
@@ -60,10 +60,10 @@ static char rcsid[] = "$NetBSD: mille.c,v 1.4 1995/03/24 05:01:48 cgd Exp $";
void rub();
main(ac, av)
-reg int ac;
-reg char *av[]; {
-
- reg bool restore;
+register int ac;
+register char *av[];
+{
+ register bool restore;
/* run as the user */
setuid(getuid());
diff --git a/mille/mille.h b/mille/mille.h
index 1d82942c..106a6d71 100644
--- a/mille/mille.h
+++ b/mille/mille.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mille.h,v 1.5 1995/03/24 05:01:51 cgd Exp $ */
+/* $NetBSD: mille.h,v 1.6 1997/05/23 23:09:39 jtc Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -153,17 +153,7 @@
# ifdef SYSV
# define srandom(x) srand(x)
# define random() rand()
-
-# ifndef attron
-# define erasechar() _tty.c_cc[VERASE]
-# define killchar() _tty.c_cc[VKILL]
-# endif
-# else
-# ifndef erasechar
-# define erasechar() _tty.sg_erase
-# define killchar() _tty.sg_kill
-# endif
-# endif SYSV
+# endif /* SYSV */
typedef struct {
bool coups[NUM_SAFE];
diff --git a/mille/misc.c b/mille/misc.c
index 8dafc778..37dc4eb3 100644
--- a/mille/misc.c
+++ b/mille/misc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.4 1995/03/24 05:01:54 cgd Exp $ */
+/* $NetBSD: misc.c,v 1.5 1997/05/23 23:09:40 jtc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: misc.c,v 1.4 1995/03/24 05:01:54 cgd Exp $";
+static char rcsid[] = "$NetBSD: misc.c,v 1.5 1997/05/23 23:09:40 jtc Exp $";
#endif
#endif /* not lint */
@@ -52,7 +52,6 @@ static char rcsid[] = "$NetBSD: misc.c,v 1.4 1995/03/24 05:01:54 cgd Exp $";
# ifdef attron
# include <term.h>
-# define _tty cur_term->Nttyb
# endif attron
/*
@@ -77,7 +76,7 @@ char *str;
CARD
getcard()
{
- reg int c, c1;
+ register int c, c1;
for (;;) {
while ((c = readch()) == '\n' || c == '\r' || c == ' ')
@@ -124,7 +123,7 @@ cont: ;
}
check_ext(forcomp)
-reg bool forcomp; {
+register bool forcomp; {
if (End == 700)
@@ -143,8 +142,8 @@ done:
}
}
else {
- reg PLAY *pp, *op;
- reg int i, safe, miles;
+ register PLAY *pp, *op;
+ register int i, safe, miles;
pp = &Player[COMP];
op = &Player[PLAYER];
@@ -178,9 +177,9 @@ done:
* also allowed. Return TRUE if the answer was yes, FALSE if no.
*/
getyn(promptno)
-register int promptno; {
-
- reg char c;
+register int promptno;
+{
+ register char c;
Saved = FALSE;
for (;;) {
@@ -249,7 +248,7 @@ check_more() {
readch()
{
- reg int cnt;
+ register int cnt;
static char c;
for (cnt = 0; read(0, &c, 1) <= 0; cnt++)
diff --git a/mille/move.c b/mille/move.c
index a63c717a..0008301b 100644
--- a/mille/move.c
+++ b/mille/move.c
@@ -1,4 +1,4 @@
-/* $NetBSD: move.c,v 1.5 1997/03/29 20:42:21 thorpej Exp $ */
+/* $NetBSD: move.c,v 1.6 1997/05/23 23:09:41 jtc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: move.c,v 1.5 1997/03/29 20:42:21 thorpej Exp $";
+static char rcsid[] = "$NetBSD: move.c,v 1.6 1997/05/23 23:09:41 jtc Exp $";
#endif
#endif /* not lint */
@@ -50,7 +50,6 @@ static char rcsid[] = "$NetBSD: move.c,v 1.5 1997/03/29 20:42:21 thorpej Exp $";
# ifdef attron
# include <term.h>
-# define _tty cur_term->Nttyb
# endif attron
/*
@@ -66,9 +65,9 @@ char *Movenames[] = {
domove()
{
- reg PLAY *pp;
- reg int i, j;
- reg bool goodplay;
+ register PLAY *pp;
+ register int i, j;
+ register bool goodplay;
pp = &Player[Play];
if (Play == PLAYER)
@@ -169,9 +168,9 @@ acc:
*/
check_go() {
- reg CARD card;
- reg PLAY *pp, *op;
- reg int i;
+ register CARD card;
+ register PLAY *pp, *op;
+ register int i;
for (pp = Player; pp < &Player[2]; pp++) {
op = (pp == &Player[COMP] ? &Player[PLAYER] : &Player[COMP]);
@@ -198,10 +197,10 @@ check_go() {
}
playcard(pp)
-reg PLAY *pp;
+register PLAY *pp;
{
- reg int v;
- reg CARD card;
+ register int v;
+ register CARD card;
/*
* check and see if player has picked
@@ -348,7 +347,7 @@ protected:
getmove()
{
- reg char c, *sp;
+ register char c, *sp;
#ifdef EXTRAP
static bool last_ex = FALSE; /* set if last command was E */
@@ -477,9 +476,9 @@ ret:
* return whether or not the player has picked
*/
haspicked(pp)
-reg PLAY *pp; {
-
- reg int card;
+register PLAY *pp;
+{
+ register int card;
if (Topcard <= Deck)
return TRUE;
@@ -496,9 +495,9 @@ reg PLAY *pp; {
}
account(card)
-reg CARD card; {
-
- reg CARD oppos;
+register CARD card;
+{
+ register CARD oppos;
if (card == C_INIT)
return;
@@ -552,10 +551,10 @@ int promptno;
}
sort(hand)
-reg CARD *hand;
+register CARD *hand;
{
- reg CARD *cp, *tp;
- reg CARD temp;
+ register CARD *cp, *tp;
+ register CARD temp;
cp = hand;
hand += HAND_SZ;
diff --git a/mille/print.c b/mille/print.c
index 5c2427c6..c9ac4f95 100644
--- a/mille/print.c
+++ b/mille/print.c
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.4 1995/03/24 05:02:02 cgd Exp $ */
+/* $NetBSD: print.c,v 1.5 1997/05/23 23:09:42 jtc Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: print.c,v 1.4 1995/03/24 05:02:02 cgd Exp $";
+static char rcsid[] = "$NetBSD: print.c,v 1.5 1997/05/23 23:09:42 jtc Exp $";
#endif
#endif /* not lint */
@@ -52,8 +52,8 @@ static char rcsid[] = "$NetBSD: print.c,v 1.4 1995/03/24 05:02:02 cgd Exp $";
prboard() {
- reg PLAY *pp;
- reg int i, j, k, temp;
+ register PLAY *pp;
+ register int i, j, k, temp;
for (k = 0; k < 2; k++) {
pp = &Player[k];
@@ -68,8 +68,8 @@ prboard() {
show_card(14, temp, pp->battle, &pp->sh_battle);
show_card(16, temp, pp->speed, &pp->sh_speed);
for (i = C_25; i <= C_200; i++) {
- reg char *name;
- reg int end;
+ register char *name;
+ register int end;
if (pp->nummiles[i] == pp->sh_nummiles[i])
continue;
@@ -118,10 +118,11 @@ register CARD c, *lc;
static char Score_fmt[] = "%4d";
prscore(for_real)
-reg bool for_real; {
+register bool for_real;
+{
- reg PLAY *pp;
- reg int x;
+ register PLAY *pp;
+ register int x;
stdscr = Score;
for (pp = Player; pp < &Player[2]; pp++) {
diff --git a/mille/roll.c b/mille/roll.c
index fa589ba9..98d84d88 100644
--- a/mille/roll.c
+++ b/mille/roll.c
@@ -1,4 +1,4 @@
-/* $NetBSD: roll.c,v 1.4 1995/03/24 05:02:07 cgd Exp $ */
+/* $NetBSD: roll.c,v 1.5 1997/05/23 23:09:42 jtc Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)roll.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: roll.c,v 1.4 1995/03/24 05:02:07 cgd Exp $";
+static char rcsid[] = "$NetBSD: roll.c,v 1.5 1997/05/23 23:09:42 jtc Exp $";
#endif
#endif /* not lint */
@@ -51,9 +51,10 @@ static char rcsid[] = "$NetBSD: roll.c,v 1.4 1995/03/24 05:02:07 cgd Exp $";
*/
roll(ndie, nsides)
-reg int ndie, nsides; {
+register int ndie, nsides;
+{
- reg int tot;
+ register int tot;
extern unsigned int random();
tot = 0;
diff --git a/mille/save.c b/mille/save.c
index 1e0ad47e..a66a6597 100644
--- a/mille/save.c
+++ b/mille/save.c
@@ -1,4 +1,4 @@
-/* $NetBSD: save.c,v 1.4 1995/03/24 05:02:13 cgd Exp $ */
+/* $NetBSD: save.c,v 1.5 1997/05/23 23:09:43 jtc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)save.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: save.c,v 1.4 1995/03/24 05:02:13 cgd Exp $";
+static char rcsid[] = "$NetBSD: save.c,v 1.5 1997/05/23 23:09:43 jtc Exp $";
#endif
#endif /* not lint */
@@ -53,7 +53,6 @@ static char rcsid[] = "$NetBSD: save.c,v 1.4 1995/03/24 05:02:13 cgd Exp $";
# ifdef attron
# include <term.h>
-# define _tty cur_term->Nttyb
# endif attron
/*
@@ -73,9 +72,9 @@ int read(), write();
save() {
extern int errno;
- reg char *sp;
- reg int outf;
- reg time_t *tp;
+ register char *sp;
+ register int outf;
+ register time_t *tp;
char buf[80];
time_t tme;
STAT junk;
@@ -149,10 +148,11 @@ over:
* be cleaned up before the game starts.
*/
rest_f(file)
-reg char *file; {
+register char *file;
+{
- reg char *sp;
- reg int inf;
+ register char *sp;
+ register int inf;
char buf[80];
STAT sbuf;
diff --git a/mille/types.c b/mille/types.c
index cbe8d6ed..ada50b25 100644
--- a/mille/types.c
+++ b/mille/types.c
@@ -1,4 +1,4 @@
-/* $NetBSD: types.c,v 1.4 1995/03/24 05:02:22 cgd Exp $ */
+/* $NetBSD: types.c,v 1.5 1997/05/23 23:09:44 jtc Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)types.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: types.c,v 1.4 1995/03/24 05:02:22 cgd Exp $";
+static char rcsid[] = "$NetBSD: types.c,v 1.5 1997/05/23 23:09:44 jtc Exp $";
#endif
#endif /* not lint */
@@ -48,14 +48,15 @@ static char rcsid[] = "$NetBSD: types.c,v 1.4 1995/03/24 05:02:22 cgd Exp $";
*/
isrepair(card)
-reg CARD card; {
+register CARD card;
+{
return card == C_GAS || card == C_SPARE || card == C_REPAIRS || card == C_INIT;
}
safety(card)
-reg CARD card; {
-
+register CARD card;
+{
switch (card) {
case C_EMPTY:
case C_GAS:
diff --git a/mille/varpush.c b/mille/varpush.c
index 1fac4cf0..d53feb6c 100644
--- a/mille/varpush.c
+++ b/mille/varpush.c
@@ -1,4 +1,4 @@
-/* $NetBSD: varpush.c,v 1.4 1995/03/24 05:02:35 cgd Exp $ */
+/* $NetBSD: varpush.c,v 1.5 1997/05/23 23:09:45 jtc Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)varpush.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: varpush.c,v 1.4 1995/03/24 05:02:35 cgd Exp $";
+static char rcsid[] = "$NetBSD: varpush.c,v 1.5 1997/05/23 23:09:45 jtc Exp $";
#endif
#endif /* not lint */
@@ -55,8 +55,9 @@ int read(), write();
* channel file. func() is either read or write.
*/
varpush(file, func)
-reg int file;
-reg int (*func)(); {
+register int file;
+register int (*func)();
+{
int temp;