PR/15878: Ed Ravin: fortune all frees junk pointers. Fixed, free structure

[bsdgames-darwin.git] / atc / update.c

diff --git a/atc/update.c b/atc/update.c
index fd7c8a05019e090ae88a9f67b759ed81143bfb3f..accc1d34ff3ad22cedf727d470df1ac8e3c602ae 100644 (file)
--- a/atc/update.c
+++ b/atc/update.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: update.c,v 1.5 1997/01/13 06:50:27 tls Exp $   */
+/*     $NetBSD: update.c,v 1.11 2001/01/16 02:50:28 cgd 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.5 1997/01/13 06:50:27 tls Exp $";
+__RCSID("$NetBSD: update.c,v 1.11 2001/01/16 02:50:28 cgd Exp $");
 #endif
-#endif not lint
+#endif /* not lint */
 
 #include "include.h"
 
-update()
+void
+update(dummy)
+       int dummy __attribute__((__unused__));
 {
-       int     i, dir_diff, mask, unclean;
-       PLANE   *pp, *p1, *p2, *p;
+       int     i, dir_diff, unclean;
+       PLANE   *pp, *p1, *p2;
 
 #ifdef SYSV
        alarm(0);
@@ -219,12 +222,11 @@ update()
 #endif
 }
 
-char *
+const char *
 command(pp)
-       PLANE   *pp;
+       const 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,20 +242,20 @@ 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;
+       const PLANE     *p;
 {
        if (p->plane_type == 0)
                return ('A' + p->plane_no);
@@ -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,6 +304,7 @@ next_plane()
        return (last_plane);
 }
 
+int
 addplane()
 {
        PLANE   p, *pp, *p1;
@@ -359,6 +365,8 @@ addplane()
        p.plane_no = pnum;
 
        pp = newplane();
+       if (pp == NULL)
+               loser(NULL, "Out of memory!");
        memcpy(pp, &p, sizeof (p));
 
        if (pp->orig_type == T_AIRPORT)
@@ -371,6 +379,7 @@ addplane()
 
 PLANE  *
 findplane(n)
+       int     n;
 {
        PLANE   *pp;
 
@@ -383,8 +392,10 @@ findplane(n)
        return (NULL);
 }
 
+int
 too_close(p1, p2, dist)
-       PLANE   *p1, *p2;
+       const 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 +404,9 @@ too_close(p1, p2, dist)
                return (0);
 }
 
+int
 dir_deg(d)
+       int d;
 {
        switch (d) {
        case 0: return (0);