goto considered harmful

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

diff --git a/atc/update.c b/atc/update.c
index 0fcc967f033c7bc69fb956926b0caffa352f93d7..4396aabaaead488b79564c2bdf09321f3b7c75b9 100644 (file)
--- a/atc/update.c
+++ b/atc/update.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: update.c,v 1.20 2009/05/26 00:00:56 dholland Exp $     */
+/*     $NetBSD: update.c,v 1.25 2014/03/22 22:58:56 dholland Exp $     */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -46,17 +46,22 @@
 #if 0
 static char sccsid[] = "@(#)update.c   8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: update.c,v 1.20 2009/05/26 00:00:56 dholland Exp $");
+__RCSID("$NetBSD: update.c,v 1.25 2014/03/22 22:58:56 dholland Exp $");
 #endif
 #endif /* not lint */
 
 #include "include.h"
 
+static int next_plane(void);
+static int too_close(const PLANE *p1, const PLANE *p2, int);
+static int dir_deg(int);
+
 /* ARGSUSED */
 void
 update(int dummy __unused)
 {
-       int     i, dir_diff, unclean;
+       int dir_diff, unclean;
+       unsigned i;
        PLANE   *pp, *p1, *p2;
 
 #ifdef SYSV
@@ -119,7 +124,7 @@ update(int dummy __unused)
 
                if (pp->delayd && pp->xpos == sp->beacon[pp->delayd_no].x &&
                    pp->ypos == sp->beacon[pp->delayd_no].y) {
-                       pp->delayd = 0;
+                       pp->delayd = false;
                        if (pp->status == S_UNMARKED)
                                pp->status = S_MARKED;
                }
@@ -212,7 +217,7 @@ update(int dummy __unused)
         * we don't update props on odd updates.
         */
        if ((rand() % sp->newplane_time) == 0)
-               (void)addplane();
+               addplane();
 
 #ifdef SYSV
        alarm(sp->update_secs);
@@ -228,14 +233,14 @@ command(const PLANE *pp)
        buf[0] = '\0';
        bp = buf;
        bpsize = sizeof(buf);
-       (void)snprintf(bp, bpsize, "%c%d%c%c%d: ", name(pp), pp->altitude, 
+       (void)snprintf(bp, bpsize, "%c%d%c%c%u: ", name(pp), pp->altitude, 
                (pp->fuel < LOWFUEL) ? '*' : ' ',
                (pp->dest_type == T_AIRPORT) ? 'A' : 'E', pp->dest_no);
 
        comm_start = bp = strchr(buf, '\0');
        bpsize = buf + sizeof(buf) - bp;
        if (pp->altitude == 0)
-               (void)snprintf(bp, bpsize, "Holding @ A%d", pp->orig_no);
+               (void)snprintf(bp, bpsize, "Holding @ A%u", pp->orig_no);
        else if (pp->new_dir >= MAXDIR || pp->new_dir < 0)
                (void)snprintf(bp, bpsize, "Circle");
        else if (pp->new_dir != pp->dir)
@@ -244,7 +249,7 @@ command(const PLANE *pp)
        bp = strchr(buf, '\0');
        bpsize = buf + sizeof(buf) - bp;
        if (pp->delayd)
-               (void)snprintf(bp, bpsize, " @ B%d", pp->delayd_no);
+               (void)snprintf(bp, bpsize, " @ B%u", pp->delayd_no);
 
        bp = strchr(buf, '\0');
        bpsize = buf + sizeof(buf) - bp;
@@ -274,7 +279,7 @@ number(int l)
                return (-1);
 }
 
-int
+static int
 next_plane(void)
 {
        static int      last_plane = -1;
@@ -298,16 +303,17 @@ next_plane(void)
                                        break;
                                }
        } while (found && last_plane != start_plane);
-       if (last_plane == start_plane)
+       if (found)
                return (-1);
        return (last_plane);
 }
 
-int
+void
 addplane(void)
 {
        PLANE   p, *pp, *p1;
-       int     i, num_starts, isclose, rnd, rnd2, pnum;
+       int     isclose, pnum;
+       unsigned num_starts, rnd, rnd2, i;
 
        (void)memset(&p, 0, sizeof (p));
 
@@ -357,10 +363,10 @@ addplane(void)
                break;
        }
        if (i >= num_starts)
-               return (-1);
+               return;
        pnum = next_plane();
        if (pnum < 0)
-               return (-1);
+               return;
        p.plane_no = pnum;
 
        pp = newplane();
@@ -372,8 +378,6 @@ addplane(void)
                append(&ground, pp);
        else
                append(&air, pp);
-
-       return (pp->dest_type);
 }
 
 PLANE *
@@ -390,7 +394,7 @@ findplane(int n)
        return (NULL);
 }
 
-int
+static int
 too_close(const PLANE *p1, const PLANE *p2, int dist)
 {
        if (ABS(p1->altitude - p2->altitude) <= dist &&
@@ -401,7 +405,7 @@ too_close(const PLANE *p1, const PLANE *p2, int dist)
                return (0);
 }
 
-int
+static int
 dir_deg(int d)
 {
        switch (d) {