Skip to content

Commit ab9f148

Browse files
jtcjtc
jtc
authored and
jtc
committed
Change "reg" to "register"
Remove private implementation of erasechar() and killchar().
1 parent ba1c517 commit ab9f148

File tree

11 files changed

+87
-95
lines changed

11 files changed

+87
-95
lines changed

‎games/mille/end.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: end.c,v 1.4 1995/03/24 05:01:30 cgd Exp $ */
1+
/* $NetBSD: end.c,v 1.5 1997/05/23 23:09:36 jtc Exp $ */
22

33
/*
44
* Copyright (c) 1982, 1993
@@ -37,7 +37,7 @@
3737
#if 0
3838
static char sccsid[] = "@(#)end.c 8.1 (Berkeley) 5/31/93";
3939
#else
40-
static char rcsid[] = "$NetBSD: end.c,v 1.4 1995/03/24 05:01:30 cgd Exp $";
40+
static char rcsid[] = "$NetBSD: end.c,v 1.5 1997/05/23 23:09:36 jtc Exp $";
4141
#endif
4242
#endif /* not lint */
4343

@@ -52,9 +52,9 @@ static char rcsid[] = "$NetBSD: end.c,v 1.4 1995/03/24 05:01:30 cgd Exp $";
5252
* the end-of-games points to the user who deserves it (if any).
5353
*/
5454
finalscore(pp)
55-
reg PLAY *pp; {
56-
57-
reg int temp, tot, num;
55+
register PLAY *pp;
56+
{
57+
register int temp, tot, num;
5858

5959
if (pp->was_finished == Finished)
6060
return;

‎games/mille/init.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: init.c,v 1.5 1995/03/24 05:01:40 cgd Exp $ */
1+
/* $NetBSD: init.c,v 1.6 1997/05/23 23:09:37 jtc Exp $ */
22

33
/*
44
* Copyright (c) 1982, 1993
@@ -37,7 +37,7 @@
3737
#if 0
3838
static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93";
3939
#else
40-
static char rcsid[] = "$NetBSD: init.c,v 1.5 1995/03/24 05:01:40 cgd Exp $";
40+
static char rcsid[] = "$NetBSD: init.c,v 1.6 1997/05/23 23:09:37 jtc Exp $";
4141
#endif
4242
#endif /* not lint */
4343

@@ -49,9 +49,9 @@ static char rcsid[] = "$NetBSD: init.c,v 1.5 1995/03/24 05:01:40 cgd Exp $";
4949

5050
init() {
5151

52-
reg PLAY *pp;
53-
reg int i, j;
54-
reg CARD card;
52+
register PLAY *pp;
53+
register int i, j;
54+
register CARD card;
5555

5656
bzero(Numseen, sizeof Numseen);
5757
Numgos = 0;
@@ -92,8 +92,8 @@ init() {
9292

9393
shuffle() {
9494

95-
reg int i, r;
96-
reg CARD temp;
95+
register int i, r;
96+
register CARD temp;
9797

9898
for (i = 0; i < DECK_SZ; i++) {
9999
r = roll(1, DECK_SZ) - 1;
@@ -168,7 +168,7 @@ newboard() {
168168

169169
newscore() {
170170

171-
reg int i, new;
171+
register int i, new;
172172
register PLAY *pp;
173173
static int was_full = -1;
174174
static int last_win = -1;

‎games/mille/mille.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mille.c,v 1.4 1995/03/24 05:01:48 cgd Exp $ */
1+
/* $NetBSD: mille.c,v 1.5 1997/05/23 23:09:38 jtc Exp $ */
22

33
/*
44
* Copyright (c) 1982, 1993
@@ -43,7 +43,7 @@ static char copyright[] =
4343
#if 0
4444
static char sccsid[] = "@(#)mille.c 8.1 (Berkeley) 5/31/93";
4545
#else
46-
static char rcsid[] = "$NetBSD: mille.c,v 1.4 1995/03/24 05:01:48 cgd Exp $";
46+
static char rcsid[] = "$NetBSD: mille.c,v 1.5 1997/05/23 23:09:38 jtc Exp $";
4747
#endif
4848
#endif /* not lint */
4949

@@ -60,10 +60,10 @@ static char rcsid[] = "$NetBSD: mille.c,v 1.4 1995/03/24 05:01:48 cgd Exp $";
6060
void rub();
6161

6262
main(ac, av)
63-
reg int ac;
64-
reg char *av[]; {
65-
66-
reg bool restore;
63+
register int ac;
64+
register char *av[];
65+
{
66+
register bool restore;
6767

6868
/* run as the user */
6969
setuid(getuid());

‎games/mille/mille.h

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mille.h,v 1.5 1995/03/24 05:01:51 cgd Exp $ */
1+
/* $NetBSD: mille.h,v 1.6 1997/05/23 23:09:39 jtc Exp $ */
22

33
/*
44
* Copyright (c) 1982, 1993
@@ -153,17 +153,7 @@
153153
# ifdef SYSV
154154
# define srandom(x) srand(x)
155155
# define random() rand()
156-
157-
# ifndef attron
158-
# define erasechar() _tty.c_cc[VERASE]
159-
# define killchar() _tty.c_cc[VKILL]
160-
# endif
161-
# else
162-
# ifndef erasechar
163-
# define erasechar() _tty.sg_erase
164-
# define killchar() _tty.sg_kill
165-
# endif
166-
# endif SYSV
156+
# endif /* SYSV */
167157

168158
typedef struct {
169159
bool coups[NUM_SAFE];

‎games/mille/misc.c

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: misc.c,v 1.4 1995/03/24 05:01:54 cgd Exp $ */
1+
/* $NetBSD: misc.c,v 1.5 1997/05/23 23:09:40 jtc Exp $ */
22

33
/*
44
* Copyright (c) 1983, 1993
@@ -37,7 +37,7 @@
3737
#if 0
3838
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93";
3939
#else
40-
static char rcsid[] = "$NetBSD: misc.c,v 1.4 1995/03/24 05:01:54 cgd Exp $";
40+
static char rcsid[] = "$NetBSD: misc.c,v 1.5 1997/05/23 23:09:40 jtc Exp $";
4141
#endif
4242
#endif /* not lint */
4343

@@ -52,7 +52,6 @@ static char rcsid[] = "$NetBSD: misc.c,v 1.4 1995/03/24 05:01:54 cgd Exp $";
5252

5353
# ifdef attron
5454
# include <term.h>
55-
# define _tty cur_term->Nttyb
5655
# endif attron
5756

5857
/*
@@ -77,7 +76,7 @@ char *str;
7776
CARD
7877
getcard()
7978
{
80-
reg int c, c1;
79+
register int c, c1;
8180

8281
for (;;) {
8382
while ((c = readch()) == '\n' || c == '\r' || c == ' ')
@@ -124,7 +123,7 @@ cont: ;
124123
}
125124

126125
check_ext(forcomp)
127-
reg bool forcomp; {
126+
register bool forcomp; {
128127

129128

130129
if (End == 700)
@@ -143,8 +142,8 @@ reg bool forcomp; {
143142
}
144143
}
145144
else {
146-
reg PLAY *pp, *op;
147-
reg int i, safe, miles;
145+
register PLAY *pp, *op;
146+
register int i, safe, miles;
148147

149148
pp = &Player[COMP];
150149
op = &Player[PLAYER];
@@ -178,9 +177,9 @@ reg bool forcomp; {
178177
* also allowed. Return TRUE if the answer was yes, FALSE if no.
179178
*/
180179
getyn(promptno)
181-
register int promptno; {
182-
183-
reg char c;
180+
register int promptno;
181+
{
182+
register char c;
184183

185184
Saved = FALSE;
186185
for (;;) {
@@ -249,7 +248,7 @@ check_more() {
249248

250249
readch()
251250
{
252-
reg int cnt;
251+
register int cnt;
253252
static char c;
254253

255254
for (cnt = 0; read(0, &c, 1) <= 0; cnt++)

‎games/mille/move.c

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: move.c,v 1.5 1997/03/29 20:42:21 thorpej Exp $ */
1+
/* $NetBSD: move.c,v 1.6 1997/05/23 23:09:41 jtc Exp $ */
22

33
/*
44
* Copyright (c) 1983, 1993
@@ -37,7 +37,7 @@
3737
#if 0
3838
static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93";
3939
#else
40-
static char rcsid[] = "$NetBSD: move.c,v 1.5 1997/03/29 20:42:21 thorpej Exp $";
40+
static char rcsid[] = "$NetBSD: move.c,v 1.6 1997/05/23 23:09:41 jtc Exp $";
4141
#endif
4242
#endif /* not lint */
4343

@@ -50,7 +50,6 @@ static char rcsid[] = "$NetBSD: move.c,v 1.5 1997/03/29 20:42:21 thorpej Exp $";
5050

5151
# ifdef attron
5252
# include <term.h>
53-
# define _tty cur_term->Nttyb
5453
# endif attron
5554

5655
/*
@@ -66,9 +65,9 @@ char *Movenames[] = {
6665

6766
domove()
6867
{
69-
reg PLAY *pp;
70-
reg int i, j;
71-
reg bool goodplay;
68+
register PLAY *pp;
69+
register int i, j;
70+
register bool goodplay;
7271

7372
pp = &Player[Play];
7473
if (Play == PLAYER)
@@ -169,9 +168,9 @@ domove()
169168
*/
170169
check_go() {
171170

172-
reg CARD card;
173-
reg PLAY *pp, *op;
174-
reg int i;
171+
register CARD card;
172+
register PLAY *pp, *op;
173+
register int i;
175174

176175
for (pp = Player; pp < &Player[2]; pp++) {
177176
op = (pp == &Player[COMP] ? &Player[PLAYER] : &Player[COMP]);
@@ -198,10 +197,10 @@ check_go() {
198197
}
199198

200199
playcard(pp)
201-
reg PLAY *pp;
200+
register PLAY *pp;
202201
{
203-
reg int v;
204-
reg CARD card;
202+
register int v;
203+
register CARD card;
205204

206205
/*
207206
* check and see if player has picked
@@ -348,7 +347,7 @@ reg PLAY *pp;
348347

349348
getmove()
350349
{
351-
reg char c, *sp;
350+
register char c, *sp;
352351
#ifdef EXTRAP
353352
static bool last_ex = FALSE; /* set if last command was E */
354353

@@ -477,9 +476,9 @@ getmove()
477476
* return whether or not the player has picked
478477
*/
479478
haspicked(pp)
480-
reg PLAY *pp; {
481-
482-
reg int card;
479+
register PLAY *pp;
480+
{
481+
register int card;
483482

484483
if (Topcard <= Deck)
485484
return TRUE;
@@ -496,9 +495,9 @@ reg PLAY *pp; {
496495
}
497496

498497
account(card)
499-
reg CARD card; {
500-
501-
reg CARD oppos;
498+
register CARD card;
499+
{
500+
register CARD oppos;
502501

503502
if (card == C_INIT)
504503
return;
@@ -552,10 +551,10 @@ int promptno;
552551
}
553552

554553
sort(hand)
555-
reg CARD *hand;
554+
register CARD *hand;
556555
{
557-
reg CARD *cp, *tp;
558-
reg CARD temp;
556+
register CARD *cp, *tp;
557+
register CARD temp;
559558

560559
cp = hand;
561560
hand += HAND_SZ;

‎games/mille/print.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: print.c,v 1.4 1995/03/24 05:02:02 cgd Exp $ */
1+
/* $NetBSD: print.c,v 1.5 1997/05/23 23:09:42 jtc Exp $ */
22

33
/*
44
* Copyright (c) 1982, 1993
@@ -37,7 +37,7 @@
3737
#if 0
3838
static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 5/31/93";
3939
#else
40-
static char rcsid[] = "$NetBSD: print.c,v 1.4 1995/03/24 05:02:02 cgd Exp $";
40+
static char rcsid[] = "$NetBSD: print.c,v 1.5 1997/05/23 23:09:42 jtc Exp $";
4141
#endif
4242
#endif /* not lint */
4343

@@ -52,8 +52,8 @@ static char rcsid[] = "$NetBSD: print.c,v 1.4 1995/03/24 05:02:02 cgd Exp $";
5252

5353
prboard() {
5454

55-
reg PLAY *pp;
56-
reg int i, j, k, temp;
55+
register PLAY *pp;
56+
register int i, j, k, temp;
5757

5858
for (k = 0; k < 2; k++) {
5959
pp = &Player[k];
@@ -68,8 +68,8 @@ prboard() {
6868
show_card(14, temp, pp->battle, &pp->sh_battle);
6969
show_card(16, temp, pp->speed, &pp->sh_speed);
7070
for (i = C_25; i <= C_200; i++) {
71-
reg char *name;
72-
reg int end;
71+
register char *name;
72+
register int end;
7373

7474
if (pp->nummiles[i] == pp->sh_nummiles[i])
7575
continue;
@@ -118,10 +118,11 @@ register CARD c, *lc;
118118
static char Score_fmt[] = "%4d";
119119

120120
prscore(for_real)
121-
reg bool for_real; {
121+
register bool for_real;
122+
{
122123

123-
reg PLAY *pp;
124-
reg int x;
124+
register PLAY *pp;
125+
register int x;
125126

126127
stdscr = Score;
127128
for (pp = Player; pp < &Player[2]; pp++) {

‎games/mille/roll.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: roll.c,v 1.4 1995/03/24 05:02:07 cgd Exp $ */
1+
/* $NetBSD: roll.c,v 1.5 1997/05/23 23:09:42 jtc Exp $ */
22

33
/*
44
* Copyright (c) 1982, 1993
@@ -37,7 +37,7 @@
3737
#if 0
3838
static char sccsid[] = "@(#)roll.c 8.1 (Berkeley) 5/31/93";
3939
#else
40-
static char rcsid[] = "$NetBSD: roll.c,v 1.4 1995/03/24 05:02:07 cgd Exp $";
40+
static char rcsid[] = "$NetBSD: roll.c,v 1.5 1997/05/23 23:09:42 jtc Exp $";
4141
#endif
4242
#endif /* not lint */
4343

@@ -51,9 +51,10 @@ static char rcsid[] = "$NetBSD: roll.c,v 1.4 1995/03/24 05:02:07 cgd Exp $";
5151
*/
5252

5353
roll(ndie, nsides)
54-
reg int ndie, nsides; {
54+
register int ndie, nsides;
55+
{
5556

56-
reg int tot;
57+
register int tot;
5758
extern unsigned int random();
5859

5960
tot = 0;

0 commit comments

Comments
 (0)