Make gcc -Wall happy

diff --git a/Parser/grammar.c b/Parser/grammar.c
index 3da7d3ff6f01573285330a4f90babe4da5f35561..51bf90ea37c9266122c9bf44f84c25cd23574d55 100644 (file)
--- a/Parser/grammar.c
+++ b/Parser/grammar.c
@@ -159,7 +159,7 @@ findlabel(ll, type, str)
        }
        fprintf(stderr, "Label %d/'%s' not found\n", type, str);
        fatal("grammar.c:findlabel()");
-       /*NOTREACHED*/
+       return 0; /* Make gcc -Wall happy */
 }
 
 /* Forward */

diff --git a/Parser/intrcheck.c b/Parser/intrcheck.c
index 5d02d177386344d8949bf451ba226f4cfa601f44..5213573a4a30bccf5681561060326f3a44cc0fad 100644 (file)
--- a/Parser/intrcheck.c
+++ b/Parser/intrcheck.c
@@ -125,6 +125,9 @@ intrcheck()
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 static int interrupted;
 

diff --git a/Parser/myreadline.c b/Parser/myreadline.c
index a94df8f549c0df1c66553200e96330f278c2b39c..5eff847d161046116e0d09539607a8975ba4a8d6 100644 (file)
--- a/Parser/myreadline.c
+++ b/Parser/myreadline.c
@@ -54,6 +54,8 @@ PERFORMANCE OF THIS SOFTWARE.
 extern char *readline();
 extern int rl_initialize();
 extern int rl_insert();
+extern int rl_bind_key();
+extern void add_history();
 extern char *rl_readline_name;
 
 #include <setjmp.h>

diff --git a/Parser/pgen.c b/Parser/pgen.c
index dff4aed704282814e7685063f3c6d203f992b3a8..c5a0618479c957f8be576a15ecc0c9c69c5132ba 100644 (file)
--- a/Parser/pgen.c
+++ b/Parser/pgen.c
@@ -66,10 +66,14 @@ typedef struct _nfa {
 } nfa;
 
 /* Forward */
-static compile_rhs PROTO((labellist *ll, nfa *nf, node *n, int *pa, int *pb));
-static compile_alt PROTO((labellist *ll, nfa *nf, node *n, int *pa, int *pb));
-static compile_item PROTO((labellist *ll, nfa *nf, node *n, int *pa, int *pb));
-static compile_atom PROTO((labellist *ll, nfa *nf, node *n, int *pa, int *pb));
+static void compile_rhs PROTO((labellist *ll,
+                              nfa *nf, node *n, int *pa, int *pb));
+static void compile_alt PROTO((labellist *ll,
+                              nfa *nf, node *n, int *pa, int *pb));
+static void compile_item PROTO((labellist *ll,
+                               nfa *nf, node *n, int *pa, int *pb));
+static void compile_atom PROTO((labellist *ll,
+                               nfa *nf, node *n, int *pa, int *pb));
 
 static int
 addnfastate(nf)
@@ -128,7 +132,7 @@ typedef struct _nfagrammar {
 } nfagrammar;
 
 /* Forward */
-static compile_rule PROTO((nfagrammar *gr, node *n));
+static void compile_rule PROTO((nfagrammar *gr, node *n));
 
 static nfagrammar *
 newnfagrammar()
@@ -195,7 +199,7 @@ metacompile(n)
        return gr;
 }
 
-static
+static void
 compile_rule(gr, n)
        nfagrammar *gr;
        node *n;
@@ -216,7 +220,7 @@ compile_rule(gr, n)
        REQ(n, NEWLINE);
 }
 
-static
+static void
 compile_rhs(ll, nf, n, pa, pb)
        labellist *ll;
        nfa *nf;
@@ -253,7 +257,7 @@ compile_rhs(ll, nf, n, pa, pb)
        }
 }
 
-static
+static void
 compile_alt(ll, nf, n, pa, pb)
        labellist *ll;
        nfa *nf;
@@ -284,7 +288,7 @@ compile_alt(ll, nf, n, pa, pb)
        }
 }
 
-static
+static void
 compile_item(ll, nf, n, pa, pb)
        labellist *ll;
        nfa *nf;
@@ -325,7 +329,7 @@ compile_item(ll, nf, n, pa, pb)
        }
 }
 
-static
+static void
 compile_atom(ll, nf, n, pa, pb)
        labellist *ll;
        nfa *nf;
@@ -437,12 +441,12 @@ typedef struct _ss_dfa {
 } ss_dfa;
 
 /* Forward */
-static printssdfa PROTO((int xx_nstates, ss_state *xx_state, int nbits,
-                        labellist *ll, char *msg));
-static simplify PROTO((int xx_nstates, ss_state *xx_state));
-static convert PROTO((dfa *d, int xx_nstates, ss_state *xx_state));
+static void printssdfa PROTO((int xx_nstates, ss_state *xx_state, int nbits,
+                             labellist *ll, char *msg));
+static void simplify PROTO((int xx_nstates, ss_state *xx_state));
+static void convert PROTO((dfa *d, int xx_nstates, ss_state *xx_state));
 
-static
+static void
 makedfa(gr, nf, d)
        nfagrammar *gr;
        nfa *nf;
@@ -548,7 +552,7 @@ makedfa(gr, nf, d)
        /* XXX cleanup */
 }
 
-static
+static void
 printssdfa(xx_nstates, xx_state, nbits, ll, msg)
        int xx_nstates;
        ss_state *xx_state;
@@ -629,7 +633,7 @@ renamestates(xx_nstates, xx_state, from, to)
        }
 }
 
-static
+static void
 simplify(xx_nstates, xx_state)
        int xx_nstates;
        ss_state *xx_state;
@@ -661,7 +665,7 @@ simplify(xx_nstates, xx_state)
 
 /* Convert the DFA into a grammar that can be used by our parser */
 
-static
+static void
 convert(d, xx_nstates, xx_state)
        dfa *d;
        int xx_nstates;

diff --git a/Parser/pgenmain.c b/Parser/pgenmain.c
index 98b5ac5c03e3e3818c589a3d277feace47e4a87b..d0395e9aea9d2e9eef7d8bb5da24dca1fa911658 100644 (file)
--- a/Parser/pgenmain.c
+++ b/Parser/pgenmain.c
@@ -101,6 +101,7 @@ main(argc, argv)
        printnonterminals(g, fp);
        fclose(fp);
        goaway(0);
+       return 0; /* Make gcc -Wall happy */
 }
 
 grammar *

diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index cff9179fc97a7de32551ec4bc7fbd8344db2b92c..8a726e0ea3f13fc2d3469f82bd89937dd52c9bfd 100644 (file)
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -279,7 +279,6 @@ tok_nextc(tok)
                                int curstart = tok->start == NULL ? -1 :
                                               tok->start - tok->buf;
                                int curvalid = tok->inp - tok->buf;
-                               int cursize = tok->end - tok->buf;
                                int newsize = curvalid + BUFSIZ;
                                char *newbuf = tok->buf;
                                RESIZE(newbuf, char, newsize);