use more suitable types

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

diff --git a/atc/input.c b/atc/input.c
index a2b49f5a4d73b89ddb0ca2f34957f00a9d905c99..c0d1be32c386c6bd044a5b01b35b16c36559ce2e 100644 (file)
--- a/atc/input.c
+++ b/atc/input.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: input.c,v 1.23 2009/05/26 00:00:56 dholland Exp $      */
+/*     $NetBSD: input.c,v 1.26 2014/03/22 22:45:05 dholland Exp $      */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -46,13 +46,40 @@
 #if 0
 static char sccsid[] = "@(#)input.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: input.c,v 1.23 2009/05/26 00:00:56 dholland Exp $");
+__RCSID("$NetBSD: input.c,v 1.26 2014/03/22 22:45:05 dholland Exp $");
 #endif
 #endif /* not lint */
 
 #include "include.h"
 #include "pathnames.h"
 
+static void rezero(void);
+static void noise(void);
+static int gettoken(void);
+static const char *setplane(int);
+static const char *turn(int);
+static const char *circle(int);
+static const char *left(int);
+static const char *right(int);
+static const char *Left(int);
+static const char *Right(int);
+static const char *delayb(int);
+static const char *beacon(int);
+static const char *ex_it(int);
+static const char *airport(int);
+static const char *climb(int);
+static const char *descend(int);
+static const char *setalt(int);
+static const char *setrelalt(int);
+static const char *benum(int);
+static const char *to_dir(int);
+static const char *rel_dir(int);
+static const char *mark(int);
+static const char *unmark(int);
+static const char *ignore(int);
+
+
+
 #define MAXRULES       6
 #define MAXDEPTH       15
 
@@ -93,7 +120,7 @@ typedef struct {
 
 #define NUMSTATES      NUMELS(st)
 
-
+static
 RULE   state0[] = {    { ALPHATOKEN,   1,      "%c:",          setplane},
                        { RETTOKEN,     -1,     "",             NULL    },
                        { HELPTOKEN,    12,     " [a-z]<ret>",  NULL    }},
@@ -160,7 +187,7 @@ RULE        state0[] = {    { ALPHATOKEN,   1,      "%c:",          setplane},
 
 #define DEF_STATE(s)   { NUMELS(s),    (s)     }
 
-STATE  st[] = {
+static STATE st[] = {
        DEF_STATE(state0), DEF_STATE(state1), DEF_STATE(state2),
        DEF_STATE(state3), DEF_STATE(state4), DEF_STATE(state5),
        DEF_STATE(state6), DEF_STATE(state7), DEF_STATE(state8),
@@ -168,13 +195,13 @@ STATE     st[] = {
        DEF_STATE(state12)
 };
 
-PLANE  p;
-STACK  stack[MAXDEPTH];
-int    level;
-int    tval;
-int    dest_type, dest_no, dir;
+static PLANE p;
+static STACK stack[MAXDEPTH];
+static int level;
+static int tval;
+static int dest_type, dest_no, dir;
 
-int
+static int
 pop(void)
 {
        if (level == 0)
@@ -189,7 +216,7 @@ pop(void)
        return (0);
 }
 
-void
+static void
 rezero(void)
 {
        iomove(0);
@@ -202,7 +229,7 @@ rezero(void)
        (void)strcpy(T_STR, "");
 }
 
-void
+static void
 push(int ruleno, int ch)
 {
        int     newstate, newpos;
@@ -286,14 +313,14 @@ getcommand(void)
        return (0);
 }
 
-void
+static void
 noise(void)
 {
        (void)putchar('\07');
        (void)fflush(stdout);
 }
 
-int
+static int
 gettoken(void)
 {
        while ((tval = getAChar()) == REDRAWTOKEN || tval == SHELLTOKEN)
@@ -357,7 +384,7 @@ gettoken(void)
                return (tval);
 }
 
-const char *
+static const char *
 setplane(int c)
 {
        PLANE   *pp;
@@ -366,12 +393,12 @@ setplane(int c)
        if (pp == NULL)
                return ("Unknown Plane");
        (void)memcpy(&p, pp, sizeof (p));
-       p.delayd = 0;
+       p.delayd = false;
        return (NULL);
 }
 
 /* ARGSUSED */
-const char *
+static const char *
 turn(int c __unused)
 {
        if (p.altitude == 0)
@@ -380,7 +407,7 @@ turn(int c __unused)
 }
 
 /* ARGSUSED */
-const char *
+static const char *
 circle(int c __unused)
 {
        if (p.altitude == 0)
@@ -390,7 +417,7 @@ circle(int c __unused)
 }
 
 /* ARGSUSED */
-const char *
+static const char *
 left(int c __unused)
 {
        dir = D_LEFT;
@@ -401,7 +428,7 @@ left(int c __unused)
 }
 
 /* ARGSUSED */
-const char *
+static const char *
 right(int c __unused)
 {
        dir = D_RIGHT;
@@ -412,7 +439,7 @@ right(int c __unused)
 }
 
 /* ARGSUSED */
-const char *
+static const char *
 Left(int c __unused)
 {
        p.new_dir = p.dir - 2;
@@ -422,7 +449,7 @@ Left(int c __unused)
 }
 
 /* ARGSUSED */
-const char *
+static const char *
 Right(int c __unused)
 {
        p.new_dir = p.dir + 2;
@@ -431,37 +458,38 @@ Right(int c __unused)
        return (NULL);
 }
 
-const char *
-delayb(int c)
+static const char *
+delayb(int ch)
 {
        int     xdiff, ydiff;
+       unsigned bn;
 
-       c -= '0';
+       bn = ch -= '0';
 
-       if (c >= sp->num_beacons)
+       if (bn >= sp->num_beacons)
                return ("Unknown beacon");
-       xdiff = sp->beacon[(int)c].x - p.xpos;
+       xdiff = sp->beacon[bn].x - p.xpos;
        xdiff = SGN(xdiff);
-       ydiff = sp->beacon[(int)c].y - p.ypos;
+       ydiff = sp->beacon[bn].y - p.ypos;
        ydiff = SGN(ydiff);
        if (xdiff != displacement[p.dir].dx || ydiff != displacement[p.dir].dy)
                return ("Beacon is not in flight path");
-       p.delayd = 1;
-       p.delayd_no = c;
+       p.delayd = true;
+       p.delayd_no = bn;
 
        if (dest_type != T_NODEST) {
                switch (dest_type) {
                case T_BEACON:
-                       xdiff = sp->beacon[dest_no].x - sp->beacon[(int)c].x;
-                       ydiff = sp->beacon[dest_no].y - sp->beacon[(int)c].y;
+                       xdiff = sp->beacon[dest_no].x - sp->beacon[bn].x;
+                       ydiff = sp->beacon[dest_no].y - sp->beacon[bn].y;
                        break;
                case T_EXIT:
-                       xdiff = sp->exit[dest_no].x - sp->beacon[(int)c].x;
-                       ydiff = sp->exit[dest_no].y - sp->beacon[(int)c].y;
+                       xdiff = sp->exit[dest_no].x - sp->beacon[bn].x;
+                       ydiff = sp->exit[dest_no].y - sp->beacon[bn].y;
                        break;
                case T_AIRPORT:
-                       xdiff = sp->airport[dest_no].x - sp->beacon[(int)c].x;
-                       ydiff = sp->airport[dest_no].y - sp->beacon[(int)c].y;
+                       xdiff = sp->airport[dest_no].x - sp->beacon[bn].x;
+                       ydiff = sp->airport[dest_no].y - sp->beacon[bn].y;
                        break;
                default:
                        return ("Bad case in delayb!  Get help!");
@@ -476,7 +504,7 @@ delayb(int c)
 }
 
 /* ARGSUSED */
-const char *
+static const char *
 beacon(int c __unused)
 {
        dest_type = T_BEACON;
@@ -484,7 +512,7 @@ beacon(int c __unused)
 }
 
 /* ARGSUSED */
-const char *
+static const char *
 ex_it(int c __unused)
 {
        dest_type = T_EXIT;
@@ -492,7 +520,7 @@ ex_it(int c __unused)
 }
 
 /* ARGSUSED */
-const char *
+static const char *
 airport(int c __unused)
 {
        dest_type = T_AIRPORT;
@@ -500,7 +528,7 @@ airport(int c __unused)
 }
 
 /* ARGSUSED */
-const char *
+static const char *
 climb(int c __unused)
 {
        dir = D_UP;
@@ -508,14 +536,14 @@ climb(int c __unused)
 }
 
 /* ARGSUSED */
-const char *
+static const char *
 descend(int c __unused)
 {
        dir = D_DOWN;
        return (NULL);
 }
 
-const char *
+static const char *
 setalt(int c)
 {
        int newalt = c - '0';
@@ -528,7 +556,7 @@ setalt(int c)
        return (NULL);
 }
 
-const char *
+static const char *
 setrelalt(int c)
 {
        int newalt;
@@ -559,29 +587,32 @@ setrelalt(int c)
        return (NULL);
 }
 
-const char *
-benum(int c)
+static const char *
+benum(int ch)
 {
-       dest_no = c -= '0';
+       unsigned n;
+
+       n = ch - '0';
+       dest_no = n;
 
        switch (dest_type) {
        case T_BEACON:
-               if (c >= sp->num_beacons)
+               if (n >= sp->num_beacons)
                        return ("Unknown beacon");
-               p.new_dir = DIR_FROM_DXDY(sp->beacon[(int)c].x - p.xpos,
-                       sp->beacon[(int)c].y - p.ypos);
+               p.new_dir = DIR_FROM_DXDY(sp->beacon[n].x - p.xpos,
+                       sp->beacon[n].y - p.ypos);
                break;
        case T_EXIT:
-               if (c >= sp->num_exits)
+               if (n >= sp->num_exits)
                        return ("Unknown exit");
-               p.new_dir = DIR_FROM_DXDY(sp->exit[(int)c].x - p.xpos,
-                       sp->exit[(int)c].y - p.ypos);
+               p.new_dir = DIR_FROM_DXDY(sp->exit[n].x - p.xpos,
+                       sp->exit[n].y - p.ypos);
                break;
        case T_AIRPORT:
-               if (c >= sp->num_airports)
+               if (n >= sp->num_airports)
                        return ("Unknown airport");
-               p.new_dir = DIR_FROM_DXDY(sp->airport[(int)c].x - p.xpos,
-                       sp->airport[(int)c].y - p.ypos);
+               p.new_dir = DIR_FROM_DXDY(sp->airport[n].x - p.xpos,
+                       sp->airport[n].y - p.ypos);
                break;
        default:
                return ("Unknown case in benum!  Get help!");
@@ -589,14 +620,14 @@ benum(int c)
        return (NULL);
 }
 
-const char *
+static const char *
 to_dir(int c)
 {
        p.new_dir = dir_no(c);
        return (NULL);
 }
 
-const char *
+static const char *
 rel_dir(int c)
 {
        int     angle;
@@ -620,7 +651,7 @@ rel_dir(int c)
 }
 
 /* ARGSUSED */
-const char *
+static const char *
 mark(int c __unused)
 {
        if (p.altitude == 0)
@@ -632,7 +663,7 @@ mark(int c __unused)
 }
 
 /* ARGSUSED */
-const char *
+static const char *
 unmark(int c __unused)
 {
        if (p.altitude == 0)
@@ -644,7 +675,7 @@ unmark(int c __unused)
 }
 
 /* ARGSUSED */
-const char *
+static const char *
 ignore(int c __unused)
 {
        if (p.altitude == 0)