svn commit: r334078 - head/sbin/devd

[Eitan Adler]

Author: eadler
Date: Wed May 23 07:39:05 2018
New Revision: 334078
URL: https://svnweb.freebsd.org/changeset/base/334078

Log:
  devd: compile at WARNS=6
  
  Verified with "make universe TARGETS='amd64 arm arm64 i386 sparc64'"

Modified:
  head/sbin/devd/Makefile
  head/sbin/devd/devd.cc
  head/sbin/devd/token.l

Modified: head/sbin/devd/Makefile
==============================================================================
--- head/sbin/devd/Makefile	Wed May 23 07:39:02 2018	(r334077)
+++ head/sbin/devd/Makefile	Wed May 23 07:39:05 2018	(r334078)
@@ -7,7 +7,7 @@ PROG_CXX=devd
 SRCS=	devd.cc token.l parse.y y.tab.h
 MAN=	devd.8 devd.conf.5
 
-WARNS?=	3
+YFLAGS=-dvi
 
 NO_SHARED?=YES
 
@@ -16,7 +16,7 @@ LIBADD=	l util
 YFLAGS+=-v
 CFLAGS+=-I. -I${.CURDIR}
 
-CLEANFILES= y.output
+CLEANFILES= y.output y.tab.i
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

Modified: head/sbin/devd/devd.cc
==============================================================================
--- head/sbin/devd/devd.cc	Wed May 23 07:39:02 2018	(r334077)
+++ head/sbin/devd/devd.cc	Wed May 23 07:39:05 2018	(r334078)
@@ -173,7 +173,7 @@ delete_and_clear(vector<T *> &v)
 	v.clear();
 }
 
-config cfg;
+static config cfg;
 
 event_proc::event_proc() : _prio(-1)
 {
@@ -902,10 +902,10 @@ create_socket(const char *name, int socktype)
 	return (fd);
 }
 
-unsigned int max_clients = 10;	/* Default, can be overridden on cmdline. */
-unsigned int num_clients;
+static unsigned int max_clients = 10;	/* Default, can be overridden on cmdline. */
+static unsigned int num_clients;
 
-list<client_t> clients;
+static list<client_t> clients;
 
 void
 notify_clients(const char *data, int len)

Modified: head/sbin/devd/token.l
==============================================================================
--- head/sbin/devd/token.l	Wed May 23 07:39:02 2018	(r334077)
+++ head/sbin/devd/token.l	Wed May 23 07:39:05 2018	(r334078)
@@ -38,6 +38,7 @@
 #include "devd.h"
 #include "y.tab.h"
 
+extern int lineno;
 int lineno = 1;
 
 static void