Skip to content

Commit 4931378

Browse files
jmcjmc
jmc
authored and
jmc
committed
KNF and WARNS=3 fixes
1 parent 243d04e commit 4931378

File tree

9 files changed

+185
-244
lines changed

9 files changed

+185
-244
lines changed

‎games/atc/extern.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: extern.c,v 1.7 2003/08/07 09:36:53 agc Exp $ */
1+
/* $NetBSD: extern.c,v 1.8 2005/07/01 00:48:34 jmc Exp $ */
22

33
/*-
44
* Copyright (c) 1990, 1993
@@ -46,7 +46,7 @@
4646
#if 0
4747
static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93";
4848
#else
49-
__RCSID("$NetBSD: extern.c,v 1.7 2003/08/07 09:36:53 agc Exp $");
49+
__RCSID("$NetBSD: extern.c,v 1.8 2005/07/01 00:48:34 jmc Exp $");
5050
#endif
5151
#endif /* not lint */
5252

@@ -56,7 +56,7 @@ char GAMES[] = "Game_List";
5656

5757
int clck, safe_planes, start_time, test_mode;
5858

59-
const char *file;
59+
const char *filename;
6060

6161
FILE *filein, *fileout;
6262

‎games/atc/extern.h‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: extern.h,v 1.11 2004/01/27 20:30:28 jsm Exp $ */
1+
/* $NetBSD: extern.h,v 1.12 2005/07/01 00:48:34 jmc Exp $ */
22

33
/*-
44
* Copyright (c) 1990, 1993
@@ -44,7 +44,7 @@
4444
*/
4545

4646
extern char GAMES[];
47-
extern const char *file;
47+
extern const char *filename;
4848

4949
extern int clck, safe_planes, start_time, test_mode;
5050

@@ -70,7 +70,7 @@ int checkdefs(void);
7070
int compar(const void *, const void *);
7171
void delete(LIST *, PLANE *);
7272
int dir_deg(int);
73-
int dir_no(char);
73+
int dir_no(int);
7474
void done_screen(void);
7575
void draw_all(void);
7676
void draw_line(WINDOW *, int, int, int, int, const char *);
@@ -92,7 +92,7 @@ int main(int, char *[]);
9292
char name(const PLANE *);
9393
int next_plane(void);
9494
void noise(void);
95-
int number(char);
95+
int number(int);
9696
void open_score_file(void);
9797
void planewin(void);
9898
int pop(void);
@@ -109,30 +109,30 @@ int yylex(void);
109109
#ifndef YYEMPTY
110110
int yyparse(void);
111111
#endif
112-
const char *Left(char);
113-
const char *Right(char);
114-
const char *airport(char);
115-
const char *beacon(char);
116-
const char *benum(char);
117-
const char *circle(char);
118-
const char *climb(char);
112+
const char *Left(int);
113+
const char *Right(int);
114+
const char *airport(int);
115+
const char *beacon(int);
116+
const char *benum(int);
117+
const char *circle(int);
118+
const char *climb(int);
119119
const char *command(const PLANE *);
120120
const char *default_game(void);
121-
const char *delayb(char);
122-
const char *descend(char);
123-
const char *ex_it(char);
121+
const char *delayb(int);
122+
const char *descend(int);
123+
const char *ex_it(int);
124124
PLANE *findplane(int);
125-
const char *ignore(char);
126-
const char *left(char);
127-
const char *mark(char);
125+
const char *ignore(int);
126+
const char *left(int);
127+
const char *mark(int);
128128
PLANE *newplane(void);
129129
const char *okay_game(const char *);
130-
const char *rel_dir(char);
131-
const char *right(char);
132-
const char *setalt(char);
133-
const char *setplane(char);
134-
const char *setrelalt(char);
130+
const char *rel_dir(int);
131+
const char *right(int);
132+
const char *setalt(int);
133+
const char *setplane(int);
134+
const char *setrelalt(int);
135135
const char *timestr(int);
136-
const char *to_dir(char);
137-
const char *turn(char);
138-
const char *unmark(char);
136+
const char *to_dir(int);
137+
const char *turn(int);
138+
const char *unmark(int);

‎games/atc/grammar.y‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: grammar.y,v 1.8 2003/08/07 09:36:54 agc Exp $ */
1+
/* $NetBSD: grammar.y,v 1.9 2005/07/01 00:48:34 jmc Exp $ */
22

33
/*-
44
* Copyright (c) 1990, 1993
@@ -64,7 +64,7 @@
6464
#if 0
6565
static char sccsid[] = "@(#)grammar.y 8.1 (Berkeley) 5/31/93";
6666
#else
67-
__RCSID("$NetBSD: grammar.y,v 1.8 2003/08/07 09:36:54 agc Exp $");
67+
__RCSID("$NetBSD: grammar.y,v 1.9 2005/07/01 00:48:34 jmc Exp $");
6868
#endif
6969
#endif /* not lint */
7070

@@ -285,17 +285,15 @@ Lline:
285285
%%
286286

287287
void
288-
check_edge(x, y)
289-
int x, y;
288+
check_edge(int x, int y)
290289
{
291290
if (!(x == 0) && !(x == sp->width - 1) &&
292291
!(y == 0) && !(y == sp->height - 1))
293292
yyerror("edge value not on edge.");
294293
}
295294

296295
void
297-
check_point(x, y)
298-
int x, y;
296+
check_point(int x, int y)
299297
{
300298
if (x < 1 || x >= sp->width - 1)
301299
yyerror("X value out of range.");
@@ -304,8 +302,7 @@ check_point(x, y)
304302
}
305303

306304
void
307-
check_linepoint(x, y)
308-
int x, y;
305+
check_linepoint(int x, int y)
309306
{
310307
if (x < 0 || x >= sp->width)
311308
yyerror("X value out of range.");
@@ -314,34 +311,31 @@ check_linepoint(x, y)
314311
}
315312

316313
void
317-
check_line(x1, y1, x2, y2)
318-
int x1, y1, x2, y2;
314+
check_line(int px1, int py1, int px2, int py2)
319315
{
320316
int d1, d2;
321317

322-
check_linepoint(x1, y1);
323-
check_linepoint(x2, y2);
318+
check_linepoint(px1, py1);
319+
check_linepoint(px2, py2);
324320

325-
d1 = ABS(x2 - x1);
326-
d2 = ABS(y2 - y1);
321+
d1 = ABS(px2 - px1);
322+
d2 = ABS(py2 - py1);
327323

328324
if (!(d1 == d2) && !(d1 == 0) && !(d2 == 0))
329325
yyerror("Bad line endpoints.");
330326
}
331327

332328
int
333-
yyerror(s)
334-
const char *s;
329+
yyerror(const char *s)
335330
{
336-
fprintf(stderr, "\"%s\": line %d: %s\n", file, line, s);
331+
fprintf(stderr, "\"%s\": line %d: %s\n", filename, line, s);
337332
errors++;
338333

339334
return (errors);
340335
}
341336

342337
void
343-
check_edir(x, y, dir)
344-
int x, y, dir;
338+
check_edir(int x, int y, int dir)
345339
{
346340
int bad = 0;
347341

@@ -373,27 +367,27 @@ check_edir(x, y, dir)
373367
}
374368

375369
int
376-
checkdefs()
370+
checkdefs(void)
377371
{
378-
int err = 0;
372+
int error = 0;
379373

380374
if (sp->width == 0) {
381375
yyerror("'width' undefined.");
382-
err++;
376+
error++;
383377
}
384378
if (sp->height == 0) {
385379
yyerror("'height' undefined.");
386-
err++;
380+
error++;
387381
}
388382
if (sp->update_secs == 0) {
389383
yyerror("'update' undefined.");
390-
err++;
384+
error++;
391385
}
392386
if (sp->newplane_time == 0) {
393387
yyerror("'newplane' undefined.");
394-
err++;
388+
error++;
395389
}
396-
if (err)
390+
if (error)
397391
return (-1);
398392
else
399393
return (0);

0 commit comments

Comments
 (0)