Skip to content

Commit 84f80fd

Browse files
lukemlukem
committed
KNFify
1 parent 8e80f91 commit 84f80fd

File tree

12 files changed

+2428
-1943
lines changed

12 files changed

+2428
-1943
lines changed

‎games/adventure/crc.c

Lines changed: 63 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: crc.c,v 1.4 1997/10/10 11:59:36 lukem Exp $ */
1+
/* $NetBSD: crc.c,v 1.5 1997/10/11 01:53:21 lukem Exp $ */
22

33
/*-
44
* Copyright (c) 1993
@@ -42,67 +42,66 @@
4242
static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 5/31/93";
4343
static char ORIGINAL_sccsid[] = "@(#)crc.c 5.2 (Berkeley) 4/4/91";
4444
#else
45-
__RCSID("$NetBSD: crc.c,v 1.4 1997/10/10 11:59:36 lukem Exp $");
45+
__RCSID("$NetBSD: crc.c,v 1.5 1997/10/11 01:53:21 lukem Exp $");
4646
#endif
4747
#endif /* not lint */
4848

4949
#include "extern.h"
5050

5151
unsigned long crctab[] = {
5252
0x7fffffff,
53-
0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
54-
0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e,
55-
0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
56-
0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d,
57-
0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0,
58-
0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63,
59-
0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
60-
0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa,
61-
0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75,
62-
0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, 0xc8d75180,
63-
0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
64-
0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87,
65-
0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
66-
0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5,
67-
0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
68-
0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4,
69-
0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b,
70-
0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea,
71-
0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
72-
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541,
73-
0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc,
74-
0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f,
75-
0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
76-
0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, 0x5edef90e,
77-
0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
78-
0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c,
79-
0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
80-
0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b,
81-
0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, 0x8708a3d2,
82-
0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671,
83-
0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
84-
0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8,
85-
0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767,
86-
0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, 0x36034af6,
87-
0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
88-
0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795,
89-
0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
90-
0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b,
91-
0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
92-
0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, 0x95bf4a82,
93-
0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d,
94-
0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8,
95-
0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
96-
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff,
97-
0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee,
98-
0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d,
99-
0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
100-
0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c,
101-
0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
102-
0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02,
103-
0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
53+
0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
54+
0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e,
55+
0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
56+
0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d,
57+
0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0,
58+
0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63,
59+
0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
60+
0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa,
61+
0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75,
62+
0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, 0xc8d75180,
63+
0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
64+
0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87,
65+
0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
66+
0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5,
67+
0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
68+
0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4,
69+
0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b,
70+
0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea,
71+
0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
72+
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541,
73+
0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc,
74+
0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f,
75+
0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
76+
0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, 0x5edef90e,
77+
0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
78+
0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c,
79+
0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
80+
0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b,
81+
0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, 0x8708a3d2,
82+
0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671,
83+
0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
84+
0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8,
85+
0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767,
86+
0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, 0x36034af6,
87+
0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
88+
0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795,
89+
0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
90+
0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b,
91+
0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
92+
0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, 0x95bf4a82,
93+
0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d,
94+
0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8,
95+
0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
96+
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff,
97+
0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee,
98+
0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d,
99+
0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
100+
0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c,
101+
0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
102+
0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02,
103+
0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
104104
};
105-
106105
/*
107106
* crc --
108107
* Compute a POSIX.2 checksum. This routine modified by Jim Gillogly
@@ -112,7 +111,7 @@ unsigned long crctab[] = {
112111
*/
113112

114113
unsigned long crcval;
115-
int step;
114+
int step;
116115

117116
void
118117
crc_start()
@@ -121,23 +120,21 @@ crc_start()
121120
}
122121

123122
unsigned long
124-
crc(ptr, nr) /* Process nr bytes at a time; ptr points to them */
125-
char *ptr;
126-
int nr;
123+
crc(ptr, nr) /* Process nr bytes at a time; ptr points to them */
124+
char *ptr;
125+
int nr;
127126
{
128-
int i;
129-
char *p;
127+
int i;
128+
char *p;
130129

131130
while (nr > 0)
132-
for (p = ptr; nr--; ++p)
133-
{
134-
if (!(i = crcval >> 24 ^ *p))
135-
{
131+
for (p = ptr; nr--; ++p) {
132+
if (!(i = crcval >> 24 ^ *p)) {
136133
i = step++;
137-
if (step >= sizeof(crctab)/sizeof(crctab[0]))
134+
if (step >= sizeof(crctab) / sizeof(crctab[0]))
138135
step = 0;
139136
}
140137
crcval = (crcval << 8) ^ crctab[i];
141138
}
142-
return crcval & 0xffffffff; /* Mask to 32 bits. */
139+
return crcval & 0xffffffff; /* Mask to 32 bits. */
143140
}

‎games/adventure/done.c

Lines changed: 89 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: done.c,v 1.4 1997/10/10 11:59:39 lukem Exp $ */
1+
/* $NetBSD: done.c,v 1.5 1997/10/11 01:53:23 lukem Exp $ */
22

33
/*-
44
* Copyright (c) 1991, 1993
@@ -43,75 +43,95 @@
4343
#if 0
4444
static char sccsid[] = "@(#)done.c 8.1 (Berkeley) 5/31/93";
4545
#else
46-
__RCSID("$NetBSD: done.c,v 1.4 1997/10/10 11:59:39 lukem Exp $");
46+
__RCSID("$NetBSD: done.c,v 1.5 1997/10/11 01:53:23 lukem Exp $");
4747
#endif
4848
#endif /* not lint */
4949

50-
/* Re-coding of advent in C: termination routines */
50+
/* Re-coding of advent in C: termination routines */
5151

5252
#include <stdio.h>
5353
#include "hdr.h"
5454
#include "extern.h"
5555

5656
int
57-
score() /* sort of like 20000 */
58-
{ int scor,i;
59-
mxscor=scor=0;
60-
for (i=50; i<=maxtrs; i++)
61-
{ if (ptext[i].txtlen==0) continue;
62-
k=12;
63-
if (i==chest) k=14;
64-
if (i>chest) k=16;
65-
if (prop[i]>=0) scor += 2;
66-
if (place[i]==3&&prop[i]==0) scor += k-2;
57+
score()
58+
{ /* sort of like 20000 */
59+
int scor, i;
60+
mxscor = scor = 0;
61+
for (i = 50; i <= maxtrs; i++) {
62+
if (ptext[i].txtlen == 0)
63+
continue;
64+
k = 12;
65+
if (i == chest)
66+
k = 14;
67+
if (i > chest)
68+
k = 16;
69+
if (prop[i] >= 0)
70+
scor += 2;
71+
if (place[i] == 3 && prop[i] == 0)
72+
scor += k - 2;
6773
mxscor += k;
6874
}
69-
scor += (maxdie-numdie)*10;
70-
mxscor += maxdie*10;
71-
if (!(scorng||gaveup)) scor += 4;
75+
scor += (maxdie - numdie) * 10;
76+
mxscor += maxdie * 10;
77+
if (!(scorng || gaveup))
78+
scor += 4;
7279
mxscor += 4;
73-
if (dflag!=0) scor += 25;
80+
if (dflag != 0)
81+
scor += 25;
7482
mxscor += 25;
75-
if (closng) scor += 25;
83+
if (closng)
84+
scor += 25;
7685
mxscor += 25;
77-
if (closed)
78-
{ if (bonus==0) scor += 10;
79-
if (bonus==135) scor += 25;
80-
if (bonus==134) scor += 30;
81-
if (bonus==133) scor += 45;
86+
if (closed) {
87+
if (bonus == 0)
88+
scor += 10;
89+
if (bonus == 135)
90+
scor += 25;
91+
if (bonus == 134)
92+
scor += 30;
93+
if (bonus == 133)
94+
scor += 45;
8295
}
8396
mxscor += 45;
84-
if (place[magzin]==108) scor++;
97+
if (place[magzin] == 108)
98+
scor++;
8599
mxscor++;
86100
scor += 2;
87101
mxscor += 2;
88-
for (i=1; i<=hntmax; i++)
89-
if (hinted[i]) scor -= hints[i][2];
90-
return(scor);
102+
for (i = 1; i <= hntmax; i++)
103+
if (hinted[i])
104+
scor -= hints[i][2];
105+
return (scor);
91106
}
92107

93108
void
94-
done(entry) /* entry=1 means goto 13000 */ /* game is over */
95-
int entry; /* entry=2 means goto 20000 */ /* 3=19000 */
96-
{ int i,sc;
97-
if (entry==1) mspeak(1);
98-
if (entry==3) rspeak(136);
99-
printf("\n\n\nYou scored %d out of a ",(sc=score()));
100-
printf("possible %d using %d turns.\n",mxscor,turns);
101-
for (i=1; i<=clsses; i++)
102-
if (cval[i]>=sc)
103-
{ speak(&ctext[i]);
104-
if (i==clsses-1)
105-
{ printf("To achieve the next higher rating");
109+
done(entry) /* entry=1 means goto 13000 */ /* game is over */
110+
int entry; /* entry=2 means goto 20000 */ /* 3=19000 */
111+
{
112+
int i, sc;
113+
if (entry == 1)
114+
mspeak(1);
115+
if (entry == 3)
116+
rspeak(136);
117+
printf("\n\n\nYou scored %d out of a ", (sc = score()));
118+
printf("possible %d using %d turns.\n", mxscor, turns);
119+
for (i = 1; i <= clsses; i++)
120+
if (cval[i] >= sc) {
121+
speak(&ctext[i]);
122+
if (i == clsses - 1) {
123+
printf("To achieve the next higher rating");
106124
printf(" would be a neat trick!\n\n");
107125
printf("Congratulations!!\n");
108126
exit(0);
109127
}
110-
k=cval[i]+1-sc;
128+
k = cval[i] + 1 - sc;
111129
printf("To achieve the next higher rating, you need");
112-
printf(" %d more point",k);
113-
if (k==1) printf(".\n");
114-
else printf("s.\n");
130+
printf(" %d more point", k);
131+
if (k == 1)
132+
printf(".\n");
133+
else
134+
printf("s.\n");
115135
exit(0);
116136
}
117137
printf("You just went off my scale!!!\n");
@@ -120,31 +140,36 @@ int entry; /* entry=2 means goto 20000 */ /* 3=19000 */
120140

121141

122142
int
123-
die(entry) /* label 90 */
124-
int entry;
125-
{ int i;
126-
if (entry != 99)
127-
{ rspeak(23);
128-
oldlc2=loc;
143+
die(entry) /* label 90 */
144+
int entry;
145+
{
146+
int i;
147+
if (entry != 99) {
148+
rspeak(23);
149+
oldlc2 = loc;
129150
}
130-
if (closng) /* 99 */
131-
{ rspeak(131);
151+
if (closng) { /* 99 */
152+
rspeak(131);
132153
numdie++;
133154
done(2);
134155
}
135-
yea=yes(81+numdie*2,82+numdie*2,54);
156+
yea = yes(81 + numdie * 2, 82 + numdie * 2, 54);
136157
numdie++;
137-
if (numdie==maxdie || !yea) done(2);
138-
place[water]=0;
139-
place[oil]=0;
140-
if (toting(lamp)) prop[lamp]=0;
141-
for (i=100; i>=1; i--)
142-
{ if (!toting(i)) continue;
143-
k=oldlc2;
144-
if (i==lamp) k=1;
145-
drop(i,k);
158+
if (numdie == maxdie || !yea)
159+
done(2);
160+
place[water] = 0;
161+
place[oil] = 0;
162+
if (toting(lamp))
163+
prop[lamp] = 0;
164+
for (i = 100; i >= 1; i--) {
165+
if (!toting(i))
166+
continue;
167+
k = oldlc2;
168+
if (i == lamp)
169+
k = 1;
170+
drop(i, k);
146171
}
147-
loc=3;
148-
oldloc=loc;
149-
return(2000);
172+
loc = 3;
173+
oldloc = loc;
174+
return (2000);
150175
}

‎games/adventure/extern.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: extern.h,v 1.1 1997/08/11 14:06:13 christos Exp $ */
1+
/* $NetBSD: extern.h,v 1.2 1997/10/11 01:53:25 lukem Exp $ */
22

33
/*
44
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -40,7 +40,7 @@ int die __P((int));
4040

4141
/* init.c */
4242
void init __P((char *));
43-
char *decr __P((int, int, int, int, int));
43+
char *decr __P((int, int, int, int, int));
4444
void linkdata __P((void));
4545
void trapdel __P((int));
4646
void startup __P((void));
@@ -81,7 +81,7 @@ void fatal __P((char *, int));
8181
/* subr.c */
8282
int toting __P((int));
8383
int here __P((int));
84-
int at __P((int));
84+
int at __P((int));
8585
int liq2 __P((int));
8686
int liq __P((int));
8787
int liqloc __P((int));

0 commit comments

Comments
 (0)