as a result of the env rework, arraylen() is only used in parse.y. move it there...

diff --git a/doas.c b/doas.c
index 7feaafc771af07a87ce54763b224a3c4ec0ae719..6c1b14d3f36b234c2d37c22479a8af226c43118d 100644 (file)
--- a/doas.c
+++ b/doas.c
@@ -55,20 +55,6 @@ usage(void)
        exit(1);
 }
 
-size_t
-arraylen(const char **arr)
-{
-       size_t cnt = 0;
-
-       if (arr) {
-               while (*arr) {
-                       cnt++;
-                       arr++;
-               }
-       }
-       return cnt;
-}
-
 static int
 parseuid(const char *s, uid_t *uid)
 {

diff --git a/doas.h b/doas.h
index 5de73cc5f412e4bedecd3c665fbf8d1617cb6a2a..0f96d1e369e088ef312068c52587f17718439fa9 100644 (file)
--- a/doas.h
+++ b/doas.h
@@ -29,8 +29,6 @@ extern struct rule **rules;
 extern int nrules;
 extern int parse_errors;
 
-size_t arraylen(const char **);
-
 char **prepenv(struct rule *);
 
 int yyparse(void);

diff --git a/parse.y b/parse.y
index 5e776794069eec005906ef20f6c65eabde3222a5..e89fb1c482e04bbf29f1fb0ff8213d77129e9f8d 100644 (file)
--- a/parse.y
+++ b/parse.y
@@ -58,6 +58,18 @@ static int obsolete_warned = 0;
 static void yyerror(const char *, ...);
 static int yylex(void);
 
+static size_t
+arraylen(const char **arr)
+{
+       size_t cnt = 0;
+
+       while (*arr) {
+               cnt++;
+               arr++;
+       }
+       return cnt;
+}
+
 %}
 
 %token TPERMIT TDENY TAS TCMD TARGS