From 64e97658ba659a3c374b975c3262f10910904254 Mon Sep 17 00:00:00 2001
From: hubertf <hubertf@NetBSD.org>
Date: Tue, 10 Nov 1998 13:43:30 +0000
Subject: constify, per PR 6150 by Joseph Myers <jsm28@cam.ac.uk>

---
 atc/extern.c   |  6 ++---
 atc/extern.h   | 71 +++++++++++++++++++++++++++++-----------------------------
 atc/graphics.c | 19 ++++++++--------
 atc/input.c    | 52 +++++++++++++++++++++---------------------
 atc/log.c      | 12 +++++-----
 atc/main.c     | 17 +++++++-------
 atc/update.c   | 12 +++++-----
 7 files changed, 96 insertions(+), 93 deletions(-)

(limited to 'atc')

diff --git a/atc/extern.c b/atc/extern.c
index f02eb4c3..0ec00dff 100644
--- a/atc/extern.c
+++ b/atc/extern.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.c,v 1.5 1997/10/10 02:07:04 lukem Exp $	*/
+/*	$NetBSD: extern.c,v 1.6 1998/11/10 13:43:30 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -50,7 +50,7 @@
 #if 0
 static char sccsid[] = "@(#)extern.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: extern.c,v 1.5 1997/10/10 02:07:04 lukem Exp $");
+__RCSID("$NetBSD: extern.c,v 1.6 1998/11/10 13:43:30 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -60,7 +60,7 @@ char		GAMES[] =	"Game_List";
 
 int		clck, safe_planes, start_time, test_mode;
 
-char		*file;
+const char	*file;
 
 FILE		*filein, *fileout;
 
diff --git a/atc/extern.h b/atc/extern.h
index 397c500b..802ae9b2 100644
--- a/atc/extern.h
+++ b/atc/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.6 1998/09/13 15:27:26 hubertf Exp $	*/
+/*	$NetBSD: extern.h,v 1.7 1998/11/10 13:43:30 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -47,7 +47,8 @@
  * For more info on this and all of my stuff, mail edjames@berkeley.edu.
  */
 
-extern char		GAMES[], *file;
+extern char		GAMES[];
+extern const char	*file;
 
 extern int		clck, safe_planes, start_time, test_mode;
 
@@ -76,23 +77,23 @@ int		dir_deg __P((int));
 int		dir_no __P((char));
 void		done_screen __P((void));
 void		draw_all __P((void));
-void		draw_line __P((WINDOW *, int, int, int, int, char *));
+void		draw_line __P((WINDOW *, int, int, int, int, const char *));
 void		erase_all __P((void));
 int		getAChar __P((void));
 int		getcommand __P((void));
 int		gettoken __P((void));
 void		init_gr __P((void));
-void		ioaddstr __P((int, char *));
+void		ioaddstr __P((int, const char *));
 void		ioclrtobot __P((void));
 void		ioclrtoeol __P((int));
-void		ioerror __P((int, int, char *));
+void		ioerror __P((int, int, const char *));
 void		iomove __P((int));
 int		list_games __P((void));
 int		log_score __P((int));
 void		log_score_quit __P((int)) __attribute__((__noreturn__));
-void		loser __P((PLANE *, char *)) __attribute__((__noreturn__));
+void		loser __P((const PLANE *, const char *)) __attribute__((__noreturn__));
 int		main __P((int, char *[]));
-char		name __P((PLANE *));
+char		name __P((const PLANE *));
 int		next_plane __P((void));
 void		noise __P((void));
 int		number __P((char));
@@ -100,39 +101,39 @@ void		planewin __P((void));
 int		pop __P((void));
 void		push __P((int, int));
 void		quit __P((int));
-int		read_file __P((char *));
+int		read_file __P((const char *));
 void		redraw __P((void));
 void		rezero __P((void));
-void		setup_screen __P((C_SCREEN *));
-int		too_close __P((PLANE *p1, PLANE *p2, int));
+void		setup_screen __P((const C_SCREEN *));
+int		too_close __P((const PLANE *p1, const PLANE *p2, int));
 void		update __P((int));
 int		yyerror __P((const char *));
 int		yylex __P((void));
 int		yyparse __P((void));
-char	       *Left __P((char));
-char	       *Right __P((char));
-char	       *airport __P((char));
-char	       *beacon __P((char));
-char	       *benum __P((char));
-char	       *circle __P((char));
-char	       *climb __P((char));
-char	       *command __P((PLANE *));
-char	       *default_game __P((void));
-char	       *delayb __P((char));
-char	       *descend __P((char));
-char	       *ex_it __P((char));
+const char     *Left __P((char));
+const char     *Right __P((char));
+const char     *airport __P((char));
+const char     *beacon __P((char));
+const char     *benum __P((char));
+const char     *circle __P((char));
+const char     *climb __P((char));
+const char     *command __P((const PLANE *));
+const char     *default_game __P((void));
+const char     *delayb __P((char));
+const char     *descend __P((char));
+const char     *ex_it __P((char));
 PLANE	       *findplane __P((int));
-char	       *ignore __P((char));
-char	       *left __P((char));
-char	       *mark __P((char));
+const char     *ignore __P((char));
+const char     *left __P((char));
+const char     *mark __P((char));
 PLANE	       *newplane __P((void));
-char	       *okay_game __P((char *));
-char	       *rel_dir __P((char));
-char	       *right __P((char));
-char	       *setalt __P((char));
-char	       *setplane __P((char));
-char	       *setrelalt __P((char));
-char	       *timestr __P((int));
-char	       *to_dir __P((char));
-char	       *turn __P((char));
-char	       *unmark __P((char));
+const char     *okay_game __P((const char *));
+const char     *rel_dir __P((char));
+const char     *right __P((char));
+const char     *setalt __P((char));
+const char     *setplane __P((char));
+const char     *setrelalt __P((char));
+const char     *timestr __P((int));
+const char     *to_dir __P((char));
+const char     *turn __P((char));
+const char     *unmark __P((char));
diff --git a/atc/graphics.c b/atc/graphics.c
index 6e4ec80c..f95cf0de 100644
--- a/atc/graphics.c
+++ b/atc/graphics.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: graphics.c,v 1.4 1997/10/10 02:07:11 lukem Exp $	*/
+/*	$NetBSD: graphics.c,v 1.5 1998/11/10 13:43:30 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -50,7 +50,7 @@
 #if 0
 static char sccsid[] = "@(#)graphics.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: graphics.c,v 1.4 1997/10/10 02:07:11 lukem Exp $");
+__RCSID("$NetBSD: graphics.c,v 1.5 1998/11/10 13:43:30 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -130,10 +130,11 @@ init_gr()
 
 void
 setup_screen(scp)
-	C_SCREEN	*scp;
+	const C_SCREEN	*scp;
 {
 	int	i, j;
-	char	str[3], *airstr;
+	char	str[3];
+	const char *airstr;
 
 	str[2] = '\0';
 
@@ -224,7 +225,7 @@ void
 draw_line(w, x, y, lx, ly, s)
 	WINDOW	*w;
 	int	 x, y, lx, ly;
-	char	*s;
+	const char	*s;
 {
 	int	dx, dy;
 
@@ -262,7 +263,7 @@ iomove(pos)
 void
 ioaddstr(pos, str)
 	int	 pos;
-	char	*str;
+	const char	*str;
 {
 	wmove(input, 0, pos);
 	waddstr(input, str);
@@ -281,7 +282,7 @@ ioclrtobot()
 void
 ioerror(pos, len, str)
 	int	 pos, len;
-	char	*str;
+	const char	*str;
 {
 	int	i;
 
@@ -380,8 +381,8 @@ planewin()
 
 void
 loser(p, s)
-	PLANE	*p;
-	char	*s;
+	const PLANE	*p;
+	const char	*s;
 {
 	int			c;
 #ifdef BSD
diff --git a/atc/input.c b/atc/input.c
index eb0fa9e6..a214a12f 100644
--- a/atc/input.c
+++ b/atc/input.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: input.c,v 1.10 1998/09/13 15:20:31 hubertf Exp $	*/
+/*	$NetBSD: input.c,v 1.11 1998/11/10 13:43:31 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -50,7 +50,7 @@
 #if 0
 static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: input.c,v 1.10 1998/09/13 15:20:31 hubertf Exp $");
+__RCSID("$NetBSD: input.c,v 1.11 1998/11/10 13:43:31 hubertf Exp $");
 #endif
 #endif not lint
 
@@ -70,8 +70,8 @@ __RCSID("$NetBSD: input.c,v 1.10 1998/09/13 15:20:31 hubertf Exp $");
 typedef struct {
 	int	token;
 	int	to_state;
-	char	*str;
-	char	*(*func) __P((char));
+	const char	*str;
+	const char	*(*func) __P((char));
 } RULE;
 
 typedef struct {
@@ -233,7 +233,7 @@ int
 getcommand()
 {
 	int	c, i, done;
-	char	*s, *(*func) __P((char));
+	const char	*s, *(*func) __P((char));
 	PLANE	*pp;
 
 	rezero();
@@ -359,7 +359,7 @@ gettoken()
 		return (tval);
 }
 
-char	*
+const char	*
 setplane(c)
 	char c;
 {
@@ -373,7 +373,7 @@ setplane(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 turn(c)
 	char c;
 {
@@ -382,7 +382,7 @@ turn(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 circle(c)
 	char c;
 {
@@ -392,7 +392,7 @@ circle(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 left(c)
 	char c;
 {
@@ -403,7 +403,7 @@ left(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 right(c)
 	char c;
 {
@@ -414,7 +414,7 @@ right(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 Left(c)
 	char c;
 {
@@ -424,7 +424,7 @@ Left(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 Right(c)
 	char c;
 {
@@ -434,7 +434,7 @@ Right(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 delayb(c)
 	char c;
 {
@@ -480,7 +480,7 @@ delayb(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 beacon(c)
 	char c;
 {
@@ -488,7 +488,7 @@ beacon(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 ex_it(c)
 	char c;
 {
@@ -496,7 +496,7 @@ ex_it(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 airport(c)
 	char c;
 {
@@ -504,7 +504,7 @@ airport(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 climb(c)
 	char c;
 {
@@ -512,7 +512,7 @@ climb(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 descend(c)
 	char c;
 {
@@ -520,7 +520,7 @@ descend(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 setalt(c)
 	char c;
 {
@@ -530,7 +530,7 @@ setalt(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 setrelalt(c)
 	char c;
 {
@@ -555,7 +555,7 @@ setrelalt(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 benum(c)
 	char c;
 {
@@ -587,7 +587,7 @@ benum(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 to_dir(c)
 	char c;
 {
@@ -595,7 +595,7 @@ to_dir(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 rel_dir(c)
 	char c;
 {
@@ -620,7 +620,7 @@ rel_dir(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 mark(c)
 	char c;
 {
@@ -632,7 +632,7 @@ mark(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 unmark(c)
 	char c;
 {
@@ -644,7 +644,7 @@ unmark(c)
 	return (NULL);
 }
 
-char	*
+const char	*
 ignore(c)
 	char c;
 {
diff --git a/atc/log.c b/atc/log.c
index 3782bf3e..1a515266 100644
--- a/atc/log.c
+++ b/atc/log.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: log.c,v 1.7 1998/07/24 23:22:26 hubertf Exp $	*/
+/*	$NetBSD: log.c,v 1.8 1998/11/10 13:43:31 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -50,7 +50,7 @@
 #if 0
 static char sccsid[] = "@(#)log.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: log.c,v 1.7 1998/07/24 23:22:26 hubertf Exp $");
+__RCSID("$NetBSD: log.c,v 1.8 1998/11/10 13:43:31 hubertf Exp $");
 #endif
 #endif not lint
 
@@ -61,10 +61,10 @@ int
 compar(va, vb)
 	const void *va, *vb;
 {
-	SCORE	*a, *b;
+	const SCORE	*a, *b;
 
-	a = (SCORE *)va;
-	b = (SCORE *)vb;
+	a = (const SCORE *)va;
+	b = (const SCORE *)vb;
 	if (b->planes == a->planes)
 		return (b->time - a->time);
 	else
@@ -81,7 +81,7 @@ compar(va, vb)
 #define MIN(t)		(((t) % SECAHOUR) / SECAMIN)
 #define SEC(t)		((t) % SECAMIN)
 
-char	*
+const char	*
 timestr(t)
 	int t;
 {
diff --git a/atc/main.c b/atc/main.c
index 2bed8d77..8bc180d5 100644
--- a/atc/main.c
+++ b/atc/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.7 1998/09/13 15:20:31 hubertf Exp $	*/
+/*	$NetBSD: main.c,v 1.8 1998/11/10 13:43:31 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -55,7 +55,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.7 1998/09/13 15:20:31 hubertf Exp $");
+__RCSID("$NetBSD: main.c,v 1.8 1998/11/10 13:43:31 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -71,7 +71,7 @@ main(ac, av)
 	int			seed;
 	int			f_usage = 0, f_list = 0, f_showscore = 0;
 	int			f_printpath = 0;
-	char			*file = NULL;
+	const char		*file = NULL;
 	char			*name, *ptr;
 	struct sigaction	sa;
 #ifdef BSD
@@ -222,7 +222,7 @@ main(ac, av)
 
 int
 read_file(s)
-	char	*s;
+	const char	*s;
 {
 	extern FILE	*yyin;
 	int		retval;
@@ -242,7 +242,7 @@ read_file(s)
 		return (0);
 }
 
-char	*
+const char	*
 default_game()
 {
 	FILE		*fp;
@@ -267,13 +267,14 @@ default_game()
 	return (file);
 }
 
-char	*
+const char	*
 okay_game(s)
-	char	*s;
+	const char	*s;
 {
 	FILE		*fp;
 	static char	file[256];
-	char		*ret = NULL, line[256], games[256];
+	const char	*ret = NULL;
+	char		line[256], games[256];
 
 	strcpy(games, _PATH_GAMES);
 	strcat(games, GAMES);
diff --git a/atc/update.c b/atc/update.c
index 516036ba..41ce78a4 100644
--- a/atc/update.c
+++ b/atc/update.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: update.c,v 1.7 1998/09/11 12:53:29 hubertf Exp $	*/
+/*	$NetBSD: update.c,v 1.8 1998/11/10 13:43:31 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -50,7 +50,7 @@
 #if 0
 static char sccsid[] = "@(#)update.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: update.c,v 1.7 1998/09/11 12:53:29 hubertf Exp $");
+__RCSID("$NetBSD: update.c,v 1.8 1998/11/10 13:43:31 hubertf Exp $");
 #endif
 #endif not lint
 
@@ -222,9 +222,9 @@ update(dummy)
 #endif
 }
 
-char *
+const char *
 command(pp)
-	PLANE	*pp;
+	const PLANE	*pp;
 {
 	static char	buf[50], *bp, *comm_start;
 
@@ -255,7 +255,7 @@ command(pp)
 
 char
 name(p)
-	PLANE	*p;
+	const PLANE	*p;
 {
 	if (p->plane_type == 0)
 		return ('A' + p->plane_no);
@@ -392,7 +392,7 @@ findplane(n)
 
 int
 too_close(p1, p2, dist)
-	PLANE	*p1, *p2;
+	const PLANE	*p1, *p2;
 	int	 dist;
 {
 	if (ABS(p1->altitude - p2->altitude) <= dist &&
-- 
cgit v1.2.3-56-ge451