use static in the right places to seperate modules better

ok tedu

4 files changed, 31 insertions, 13 deletions

diff --git a/usr.bin/doas/doas.c b/usr.bin/doas/doas.c
index d82d9f119b7..850c2a3066f 100644
--- a/usr.bin/doas/doas.c
+++ b/usr.bin/doas/doas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: doas.c,v 1.64 2016/09/03 11:03:18 tedu Exp $ */
+/* $OpenBSD: doas.c,v 1.65 2016/09/15 00:58:23 deraadt Exp $ */
 /*
  * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  *
@@ -161,7 +161,6 @@ static void
 parseconfig(const char *filename, int checkperms)
 {
 	extern FILE *yyfp;
-	extern int yyparse(void);
 	struct stat sb;
 
 	yyfp = fopen(filename, "r");
diff --git a/usr.bin/doas/doas.h b/usr.bin/doas/doas.h
index 93b68fadc32..2c489bedce2 100644
--- a/usr.bin/doas/doas.h
+++ b/usr.bin/doas/doas.h
@@ -1,4 +1,20 @@
-/* $OpenBSD: doas.h,v 1.9 2016/09/02 18:12:30 tedu Exp $ */
+/* $OpenBSD: doas.h,v 1.10 2016/09/15 00:58:23 deraadt Exp $ */
+/*
+ * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
 struct rule {
 	int action;
 	int options;
@@ -10,13 +26,15 @@ struct rule {
 };
 
 extern struct rule **rules;
-extern int nrules, maxrules;
+extern int nrules;
 extern int parse_errors;
 
 size_t arraylen(const char **);
 
 char **prepenv(struct rule *);
 
+int yyparse(void);
+
 #define PERMIT	1
 #define DENY	2
 
diff --git a/usr.bin/doas/env.c b/usr.bin/doas/env.c
index b003aa9772f..fd671b0c29f 100644
--- a/usr.bin/doas/env.c
+++ b/usr.bin/doas/env.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: env.c,v 1.4 2016/07/10 03:24:31 tedu Exp $ */
+/* $OpenBSD: env.c,v 1.5 2016/09/15 00:58:23 deraadt Exp $ */
 /*
  * Copyright (c) 2016 Ted Unangst <tedu@openbsd.org>
  *
@@ -194,7 +194,7 @@ prepenv(struct rule *rule)
 		NULL
 	};
 	struct env *env;
-	
+
 	env = createenv(rule);
 
 	/* if we started with blank, fill some defaults then apply rules */
diff --git a/usr.bin/doas/parse.y b/usr.bin/doas/parse.y
index 9a30e1ea7c7..db80f261a53 100644
--- a/usr.bin/doas/parse.y
+++ b/usr.bin/doas/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.21 2016/09/04 15:11:13 tedu Exp $ */
+/* $OpenBSD: parse.y,v 1.22 2016/09/15 00:58:23 deraadt Exp $ */
 /*
  * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  *
@@ -46,13 +46,14 @@ 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;
 
-void yyerror(const char *, ...);
-int yylex(void);
-int yyparse(void);
+static void yyerror(const char *, ...);
+static int yylex(void);
 
 %}
 
@@ -205,7 +206,7 @@ yyerror(const char *fmt, ...)
 	parse_errors++;
 }
 
-struct keyword {
+static struct keyword {
 	const char *word;
 	int token;
 } keywords[] = {