constify, per PR 6150 by Joseph Myers <jsm28@cam.ac.uk>

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

diff --git a/atc/input.c b/atc/input.c
index 4a094299738753ce5b5e2ce556a4835b918fc26a..a214a12f217d5c515186737d41362963535a2fd4 100644 (file)
--- a/atc/input.c
+++ b/atc/input.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: input.c,v 1.7 1998/03/29 04:45:17 mrg 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.7 1998/03/29 04:45:17 mrg Exp $");
+__RCSID("$NetBSD: input.c,v 1.11 1998/11/10 13:43:31 hubertf Exp $");
 #endif
 #endif not lint
 
@@ -61,9 +61,6 @@ __RCSID("$NetBSD: input.c,v 1.7 1998/03/29 04:45:17 mrg Exp $");
 #define MAXDEPTH       15
 
 #define RETTOKEN       '\n'
-#ifdef SYSV
-#define CRTOKEN                '\r'
-#endif
 #define REDRAWTOKEN    '\014'  /* CTRL(L) */
 #define        SHELLTOKEN      '!'
 #define HELPTOKEN      '?'
@@ -73,8 +70,8 @@ __RCSID("$NetBSD: input.c,v 1.7 1998/03/29 04:45:17 mrg 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 {
@@ -103,9 +100,6 @@ typedef struct {
 
 RULE   state0[] = {    { ALPHATOKEN,   1,      "%c:",          setplane},
                        { RETTOKEN,     -1,     "",             NULL    },
-#ifdef SYSV
-                       { CRTOKEN,      -1,     "",             NULL    },
-#endif
                        { HELPTOKEN,    12,     " [a-z]<ret>",  NULL    }},
        state1[] = {    { 't',          2,      " turn",        turn    },      
                        { 'a',          3,      " altitude:",   NULL    },      
@@ -137,9 +131,6 @@ RULE        state0[] = {    { ALPHATOKEN,   1,      "%c:",          setplane},
        state4[] = {    { '@',          9,      " at",          NULL    },      
                        { 'a',          9,      " at",          NULL    },      
                        { RETTOKEN,     -1,     "",             NULL    },
-#ifdef SYSV
-                       { CRTOKEN,      -1,     "",             NULL    },
-#endif
                        { HELPTOKEN,    12,     " @a<ret>",     NULL    }},
        state5[] = {    { NUMTOKEN,     7,      "%c",           delayb  },
                        { HELPTOKEN,    12,     " [0-9]",       NULL    }},
@@ -154,14 +145,8 @@ RULE       state0[] = {    { ALPHATOKEN,   1,      "%c:",          setplane},
                        { 'a',          4,      " 270",         rel_dir },
                        { 'q',          4,      " 315",         rel_dir },
                        { RETTOKEN,     -1,     "",             NULL    },      
-#ifdef SYSV
-                       { CRTOKEN,      -1,     "",             NULL    },      
-#endif
                        { HELPTOKEN,    12,     " @a<dir><ret>",NULL    }},
        state7[] = {    { RETTOKEN,     -1,     "",             NULL    },
-#ifdef SYSV
-                       { CRTOKEN,      -1,     "",             NULL    },
-#endif
                        { HELPTOKEN,    12,     " <ret>",       NULL    }},
        state8[] = {    { NUMTOKEN,     4,      "%c",           benum   },
                        { HELPTOKEN,    12,     " [0-9]",       NULL    }},
@@ -248,7 +233,7 @@ int
 getcommand()
 {
        int     c, i, done;
-       char    *s, *(*func) __P((char));
+       const char      *s, *(*func) __P((char));
        PLANE   *pp;
 
        rezero();
@@ -374,7 +359,7 @@ gettoken()
                return (tval);
 }
 
-char   *
+const char     *
 setplane(c)
        char c;
 {
@@ -388,7 +373,7 @@ setplane(c)
        return (NULL);
 }
 
-char   *
+const char     *
 turn(c)
        char c;
 {
@@ -397,7 +382,7 @@ turn(c)
        return (NULL);
 }
 
-char   *
+const char     *
 circle(c)
        char c;
 {
@@ -407,7 +392,7 @@ circle(c)
        return (NULL);
 }
 
-char   *
+const char     *
 left(c)
        char c;
 {
@@ -418,18 +403,18 @@ left(c)
        return (NULL);
 }
 
-char   *
+const char     *
 right(c)
        char c;
 {
        dir = D_RIGHT;
        p.new_dir = p.dir + 1;
-       if (p.new_dir > MAXDIR)
+       if (p.new_dir >= MAXDIR)
                p.new_dir -= MAXDIR;
        return (NULL);
 }
 
-char   *
+const char     *
 Left(c)
        char c;
 {
@@ -439,17 +424,17 @@ Left(c)
        return (NULL);
 }
 
-char   *
+const char     *
 Right(c)
        char c;
 {
        p.new_dir = p.dir + 2;
-       if (p.new_dir > MAXDIR)
+       if (p.new_dir >= MAXDIR)
                p.new_dir -= MAXDIR;
        return (NULL);
 }
 
-char   *
+const char     *
 delayb(c)
        char c;
 {
@@ -495,7 +480,7 @@ delayb(c)
        return (NULL);
 }
 
-char   *
+const char     *
 beacon(c)
        char c;
 {
@@ -503,7 +488,7 @@ beacon(c)
        return (NULL);
 }
 
-char   *
+const char     *
 ex_it(c)
        char c;
 {
@@ -511,7 +496,7 @@ ex_it(c)
        return (NULL);
 }
 
-char   *
+const char     *
 airport(c)
        char c;
 {
@@ -519,7 +504,7 @@ airport(c)
        return (NULL);
 }
 
-char   *
+const char     *
 climb(c)
        char c;
 {
@@ -527,7 +512,7 @@ climb(c)
        return (NULL);
 }
 
-char   *
+const char     *
 descend(c)
        char c;
 {
@@ -535,7 +520,7 @@ descend(c)
        return (NULL);
 }
 
-char   *
+const char     *
 setalt(c)
        char c;
 {
@@ -545,7 +530,7 @@ setalt(c)
        return (NULL);
 }
 
-char   *
+const char     *
 setrelalt(c)
        char c;
 {
@@ -570,7 +555,7 @@ setrelalt(c)
        return (NULL);
 }
 
-char   *
+const char     *
 benum(c)
        char c;
 {
@@ -602,7 +587,7 @@ benum(c)
        return (NULL);
 }
 
-char   *
+const char     *
 to_dir(c)
        char c;
 {
@@ -610,7 +595,7 @@ to_dir(c)
        return (NULL);
 }
 
-char   *
+const char     *
 rel_dir(c)
        char c;
 {
@@ -635,7 +620,7 @@ rel_dir(c)
        return (NULL);
 }
 
-char   *
+const char     *
 mark(c)
        char c;
 {
@@ -647,7 +632,7 @@ mark(c)
        return (NULL);
 }
 
-char   *
+const char     *
 unmark(c)
        char c;
 {
@@ -659,7 +644,7 @@ unmark(c)
        return (NULL);
 }
 
-char   *
+const char     *
 ignore(c)
        char c;
 {