aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorEitan Adler <eadler@FreeBSD.org>2018-05-23 07:39:05 +0000
committerEitan Adler <eadler@FreeBSD.org>2018-05-23 07:39:05 +0000
commit0bc60783dabd6232d8a385bab228c859ae80e22a (patch)
tree8932d4a6e05791fd851b87ea77a571b57f572c46 /sbin
parent958160f3ecdac980fee1e821fb3ca43888cbe936 (diff)
downloadsrc-0bc60783dabd6232d8a385bab228c859ae80e22a.tar.gz
src-0bc60783dabd6232d8a385bab228c859ae80e22a.zip
devd: compile at WARNS=6
Verified with "make universe TARGETS='amd64 arm arm64 i386 sparc64'"
Notes
Notes: svn path=/head/; revision=334078
Diffstat (limited to 'sbin')
-rw-r--r--sbin/devd/Makefile4
-rw-r--r--sbin/devd/devd.cc8
-rw-r--r--sbin/devd/token.l1
3 files changed, 7 insertions, 6 deletions
diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index a035c92151b4..6121d4f31bf2 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -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
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index 94e9121358df..538910664cf0 100644
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@@ -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)
diff --git a/sbin/devd/token.l b/sbin/devd/token.l
index 2221dcf05f7f..28d3aee335eb 100644
--- a/sbin/devd/token.l
+++ b/sbin/devd/token.l
@@ -38,6 +38,7 @@
#include "devd.h"
#include "y.tab.h"
+extern int lineno;
int lineno = 1;
static void