Stop accessing verbose and debug variables from log.c directly.

This replaces log_verbose() and "extern int verbose" with the two functions
log_setverbose() and log_getverbose().

Pointed out by benno@
OK krw@ eric@ gilles@ (OK gilles@ for the snmpd bits as well)

6 files changed, 25 insertions, 21 deletions

diff --git a/usr.sbin/switchd/control.c b/usr.sbin/switchd/control.c
index 0fdcf4ae19e..9367f32c16e 100644
--- a/usr.sbin/switchd/control.c
+++ b/usr.sbin/switchd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.6 2017/01/09 14:04:31 krw Exp $	*/
+/*	$OpenBSD: control.c,v 1.7 2017/01/09 14:49:22 reyk Exp $	*/
 
 /*
  * Copyright (c) 2010-2016 Reyk Floeter <reyk@openbsd.org>
@@ -361,7 +361,7 @@ control_dispatch_imsg(int fd, short event, void *arg)
 			IMSG_SIZE_CHECK(&imsg, &v);
 
 			memcpy(&v, imsg.data, sizeof(v));
-			log_verbose(v);
+			log_setverbose(v);
 
 			proc_forward_imsg(&env->sc_ps, &imsg, PROC_PARENT, -1);
 			proc_forward_imsg(&env->sc_ps, &imsg, PROC_OFP, -1);
diff --git a/usr.sbin/switchd/log.c b/usr.sbin/switchd/log.c
index 459cd67708c..168366f91d2 100644
--- a/usr.sbin/switchd/log.c
+++ b/usr.sbin/switchd/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.3 2017/01/08 20:31:03 reyk Exp $	*/
+/*	$OpenBSD: log.c,v 1.4 2017/01/09 14:49:22 reyk Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -24,13 +24,14 @@
 #include <errno.h>
 #include <time.h>
 
-int		 debug;
-int		 verbose;
+static int	 debug;
+static int	 verbose;
 const char	*log_procname;
 
 void	log_init(int, int);
 void	log_procinit(const char *);
-void	log_verbose(int);
+void	log_setverbose(int);
+int	log_getverbose(void);
 void	log_warn(const char *, ...)
 	    __attribute__((__format__ (printf, 1, 2)));
 void	log_warnx(const char *, ...)
@@ -71,11 +72,17 @@ log_procinit(const char *procname)
 }
 
 void
-log_verbose(int v)
+log_setverbose(int v)
 {
 	verbose = v;
 }
 
+int
+log_getverbose(void)
+{
+	return (verbose);
+}
+
 void
 logit(int pri, const char *fmt, ...)
 {
diff --git a/usr.sbin/switchd/proc.c b/usr.sbin/switchd/proc.c
index 7ad9bf33424..4f36a83cd42 100644
--- a/usr.sbin/switchd/proc.c
+++ b/usr.sbin/switchd/proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.9 2016/11/16 15:32:42 rzalamena Exp $	*/
+/*	$OpenBSD: proc.c,v 1.10 2017/01/09 14:49:22 reyk Exp $	*/
 
 /*
  * Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -662,7 +662,7 @@ proc_dispatch(int fd, short event, void *arg)
 		case IMSG_CTL_VERBOSE:
 			IMSG_SIZE_CHECK(&imsg, &verbose);
 			memcpy(&verbose, imsg.data, sizeof(verbose));
-			log_verbose(verbose);
+			log_setverbose(verbose);
 			break;
 		case IMSG_CTL_PROCFD:
 			IMSG_SIZE_CHECK(&imsg, &pf);
diff --git a/usr.sbin/switchd/proc.h b/usr.sbin/switchd/proc.h
index db2489337e6..f219d1c379d 100644
--- a/usr.sbin/switchd/proc.h
+++ b/usr.sbin/switchd/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.5 2016/11/16 15:32:42 rzalamena Exp $	*/
+/*	$OpenBSD: proc.h,v 1.6 2017/01/09 14:49:22 reyk Exp $	*/
 
 /*
  * Copyright (c) 2010-2015 Reyk Floeter <reyk@openbsd.org>
@@ -168,7 +168,8 @@ void	 control(struct privsep *, struct privsep_proc *);
 /* log.c */
 void	log_init(int, int);
 void	log_procinit(const char *);
-void	log_verbose(int);
+void	log_setverbose(int);
+int	log_getverbose(void);
 void	log_warn(const char *, ...)
 	    __attribute__((__format__ (printf, 1, 2)));
 void	log_warnx(const char *, ...)
diff --git a/usr.sbin/switchd/switchd.c b/usr.sbin/switchd/switchd.c
index 64b26fbf452..5d4fde3a272 100644
--- a/usr.sbin/switchd/switchd.c
+++ b/usr.sbin/switchd/switchd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: switchd.c,v 1.14 2016/10/12 19:07:42 reyk Exp $	*/
+/*	$OpenBSD: switchd.c,v 1.15 2017/01/09 14:49:22 reyk Exp $	*/
 
 /*
  * Copyright (c) 2013-2016 Reyk Floeter <reyk@openbsd.org>
@@ -175,7 +175,7 @@ main(int argc, char *argv[])
 		fatalx("unknown user " SWITCHD_USER);
 
 	log_init(debug, LOG_DAEMON);
-	log_verbose(verbose);
+	log_setverbose(verbose);
 
 	/* Configure the control socket */
 	ps->ps_csock.cs_name = SWITCHD_SOCKET;
diff --git a/usr.sbin/switchd/util.c b/usr.sbin/switchd/util.c
index d8ab3762aef..d53e674ecf4 100644
--- a/usr.sbin/switchd/util.c
+++ b/usr.sbin/switchd/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.5 2016/11/15 09:05:14 reyk Exp $	*/
+/*	$OpenBSD: util.c,v 1.6 2017/01/09 14:49:22 reyk Exp $	*/
 
 /*
  * Copyright (c) 2013-2016 Reyk Floeter <reyk@openbsd.org>
@@ -37,9 +37,6 @@
 
 #include "switchd.h"
 
-extern int debug;
-extern int verbose;
-
 void
 socket_set_blockmode(int fd, enum blockmodes bm)
 {
@@ -313,7 +310,7 @@ print_debug(const char *emsg, ...)
 {
 	va_list	 ap;
 
-	if (debug && verbose > 2) {
+	if (log_getverbose() > 2) {
 		va_start(ap, emsg);
 		vfprintf(stderr, emsg, ap);
 		va_end(ap);
@@ -325,7 +322,7 @@ print_verbose(const char *emsg, ...)
 {
 	va_list	 ap;
 
-	if (verbose) {
+	if (log_getverbose()) {
 		va_start(ap, emsg);
 		vfprintf(stderr, emsg, ap);
 		va_end(ap);
@@ -336,9 +333,8 @@ void
 print_hex(uint8_t *buf, off_t offset, size_t length)
 {
 	unsigned int	 i;
-	extern int	 verbose;
 
-	if (verbose < 3 || !length)
+	if (log_getverbose() < 3 || !length)
 		return;
 
 	for (i = 0; i < length; i++) {