X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/3e95714e815457b8e2c95138f9242701e3c08434..52ed4e04408279fad5c6a1f54d7497b6de60d3a3:/atc/update.c

diff --git a/atc/update.c b/atc/update.c
index 9fdc32b1..ef15c705 100644
--- a/atc/update.c
+++ b/atc/update.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: update.c,v 1.4 1995/04/27 21:22:26 mycroft Exp $	*/
+/*	$NetBSD: update.c,v 1.6 1997/10/10 02:07:34 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -45,20 +45,23 @@
  * For more info on this and all of my stuff, mail edjames@berkeley.edu.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)update.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: update.c,v 1.4 1995/04/27 21:22:26 mycroft Exp $";
+__RCSID("$NetBSD: update.c,v 1.6 1997/10/10 02:07:34 lukem Exp $");
 #endif
 #endif not lint
 
 #include "include.h"
 
-update()
+void
+update(dummy)
+	int dummy;
 {
-	int	i, dir_diff, mask, unclean;
-	PLANE	*pp, *p1, *p2, *p;
+	int	i, dir_diff, unclean;
+	PLANE	*pp, *p1, *p2;
 
 #ifdef SYSV
 	alarm(0);
@@ -224,7 +227,6 @@ command(pp)
 	PLANE	*pp;
 {
 	static char	buf[50], *bp, *comm_start;
-	char	*index();
 
 	buf[0] = '\0';
 	bp = buf;
@@ -232,7 +234,7 @@ command(pp)
 		(pp->fuel < LOWFUEL) ? '*' : ' ',
 		(pp->dest_type == T_AIRPORT) ? 'A' : 'E', pp->dest_no);
 
-	comm_start = bp = index(buf, '\0');
+	comm_start = bp = strchr(buf, '\0');
 	if (pp->altitude == 0)
 		(void)sprintf(bp, "Holding @ A%d", pp->orig_no);
 	else if (pp->new_dir >= MAXDIR || pp->new_dir < 0)
@@ -240,18 +242,18 @@ command(pp)
 	else if (pp->new_dir != pp->dir)
 		(void)sprintf(bp, "%d", dir_deg(pp->new_dir));
 
-	bp = index(buf, '\0');
+	bp = strchr(buf, '\0');
 	if (pp->delayd)
 		(void)sprintf(bp, " @ B%d", pp->delayd_no);
 
-	bp = index(buf, '\0');
+	bp = strchr(buf, '\0');
 	if (*comm_start == '\0' && 
 	    (pp->status == S_UNMARKED || pp->status == S_IGNORED))
 		strcpy(bp, "---------");
 	return (buf);
 }
 
-/* char */
+char
 name(p)
 	PLANE	*p;
 {
@@ -261,7 +263,9 @@ name(p)
 		return ('a' + p->plane_no);
 }
 
+int
 number(l)
+	char l;
 {
 	if (l < 'a' && l > 'z' && l < 'A' && l > 'Z')
 		return (-1);
@@ -271,6 +275,7 @@ number(l)
 		return (l - 'A');
 }
 
+int
 next_plane()
 {
 	static int	last_plane = -1;
@@ -299,12 +304,13 @@ next_plane()
 	return (last_plane);
 }
 
+int
 addplane()
 {
 	PLANE	p, *pp, *p1;
 	int	i, num_starts, close, rnd, rnd2, pnum;
 
-	bzero(&p, sizeof (p));
+	memset(&p, 0, sizeof (p));
 
 	p.status = S_MARKED;
 	p.plane_type = random() % 2;
@@ -359,7 +365,7 @@ addplane()
 	p.plane_no = pnum;
 
 	pp = newplane();
-	bcopy(&p, pp, sizeof (p));
+	memcpy(pp, &p, sizeof (p));
 
 	if (pp->orig_type == T_AIRPORT)
 		append(&ground, pp);
@@ -383,8 +389,10 @@ findplane(n)
 	return (NULL);
 }
 
+int
 too_close(p1, p2, dist)
 	PLANE	*p1, *p2;
+	int	 dist;
 {
 	if (ABS(p1->altitude - p2->altitude) <= dist &&
 	    ABS(p1->xpos - p2->xpos) <= dist && ABS(p1->ypos - p2->ypos) <= dist)
@@ -393,7 +401,9 @@ too_close(p1, p2, dist)
 		return (0);
 }
 
+int
 dir_deg(d)
+	int d;
 {
 	switch (d) {
 	case 0: return (0);