move yyparse decl next to yyfp

[opendoas.git] / parse.y

diff --git a/parse.y b/parse.y
index 43732a6291144726e88e82d3925620394ddd9ea1..e89fb1c482e04bbf29f1fb0ff8213d77129e9f8d 100644 (file)
--- a/parse.y
+++ b/parse.y
@@ -49,13 +49,26 @@ typedef struct {
 FILE *yyfp;
 
 struct rule **rules;
-int nrules, maxrules;
+int nrules;
+static int maxrules;
+
 int parse_errors = 0;
-int obsolete_warned = 0;
+static int obsolete_warned = 0;
+
+static void yyerror(const char *, ...);
+static int yylex(void);
 
-void yyerror(const char *, ...);
-int yylex(void);
-int yyparse(void);
+static size_t
+arraylen(const char **arr)
+{
+       size_t cnt = 0;
+
+       while (*arr) {
+               cnt++;
+               arr++;
+       }
+       return cnt;
+}
 
 %}
 
@@ -111,6 +124,10 @@ options:   /* none */ {
                } | options option {
                        $$.options = $1.options | $2.options;
                        $$.envlist = $1.envlist;
+                       if (($$.options & (NOPASS|PERSIST)) == (NOPASS|PERSIST)) {
+                               yyerror("can't combine nopass and persist");
+                               YYERROR;
+                       }
                        if ($2.envlist) {
                                if ($$.envlist) {
                                        yyerror("can't have two setenv sections");
@@ -201,7 +218,7 @@ yyerror(const char *fmt, ...)
        parse_errors++;
 }
 
-struct keyword {
+static struct keyword {
        const char *word;
        int token;
 } keywords[] = {