Do a sweep and remove most WARNS=6 settings

Repeating the default WARNS here makes it slightly more difficult to experiment with default WARNS changes, e.g. if we did something absolutely bananas and introduced a WARNS=7 and wanted to try lifting the default to that. Drop most of them; there is one in the blake2 kernel module, but I suspect it should be dropped -- the default WARNS in the rest of the build doesn't currently apply to kernel modules, and I haven't put too much thought into whether it makes sense to make it so.
nhuff · Oct 1, 2020 · 7cc42f6 · 7cc42f6
1 parent 9f66998
commit 7cc42f6
Show file tree

Hide file tree

Showing 99 changed files with 2 additions and 137 deletions.
diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc
@@ -7,8 +7,6 @@ IGNORE_PRAGMA=	YES
 
 CFLAGS+=	-DNEED_SOLARIS_BOOLEAN
 
-WARNS?=		6
-
 # Do not lint the CDDL stuff. It is all externally maintained and
 # lint output is wasteful noise here.
 

diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile
@@ -7,6 +7,4 @@ LIBADD=	dialog ncursesw m
 CFLAGS+= -I${.CURDIR} -I${DIALOG}
 .PATH:	${DIALOG}
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/lib/googletest/Makefile.inc b/lib/googletest/Makefile.inc
@@ -10,5 +10,3 @@ CXXFLAGS+=	${GTESTS_FLAGS}
 
 # Silence warnings about usage of deprecated std::auto_ptr
 CXXWARNFLAGS+=	-Wno-deprecated-declarations
-
-WARNS?=		6
diff --git a/lib/libcam/tests/Makefile b/lib/libcam/tests/Makefile
@@ -5,6 +5,4 @@ ATF_TESTS_C+=	cam_test
 
 LIBADD+=	cam
 
-WARNS?=		6
-
 .include <bsd.test.mk>
diff --git a/lib/libcrypt/tests/Makefile b/lib/libcrypt/tests/Makefile
@@ -4,7 +4,6 @@ ATF_TESTS_C+= crypt_tests
 
 NETBSD_ATF_TESTS_C+= crypt_test
 
-WARNS?=		6
 CFLAGS+= -I${.CURDIR:H}
 LIBADD=	crypt
 

diff --git a/lib/libiconv_modules/Makefile.inc b/lib/libiconv_modules/Makefile.inc
@@ -3,7 +3,6 @@
 .PATH: ${SRCTOP}/lib/libc/iconv
 
 SHLIB_MAJOR= 4
-WARNS?=	6
 CFLAGS+= -I${SRCTOP}/lib/libc/iconv
 
 CFLAGS+=	-Dbool=_Bool

diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
@@ -8,8 +8,6 @@ SHLIBDIR?= /lib
 SHLIB_MAJOR=	7
 CFLAGS+=-DNO__SCCSID -I${.CURDIR}
 
-WARNS?=	6
-
 SRCS=	kvm.c kvm_cptime.c kvm_getloadavg.c \
 	kvm_getswapinfo.c kvm_pcpu.c kvm_private.c kvm_proc.c kvm_vnet.c \
 	kvm_minidump_aarch64.c \

diff --git a/lib/libkvm/tests/Makefile b/lib/libkvm/tests/Makefile
@@ -13,8 +13,6 @@ CFLAGS.kvm_read_test+=		-I${.CURDIR:H}
 
 LIBADD+=	kvm
 
-WARNS?=		6
-
 BINDIR=		${TESTSDIR}
 
 .for t in kvm_geterr_test kvm_open_test kvm_open2_test kvm_read_test

diff --git a/lib/libpathconv/tests/Makefile b/lib/libpathconv/tests/Makefile
@@ -3,7 +3,6 @@
 TAP_TESTS_C+=	abs2rel
 TAP_TESTS_C+=	rel2abs
 
-WARNS?=		6
 #LIBADD+=	pathconv
 #LDADD+= -L .. -lpathconv
 LDADD+= ../libpathconv.a

diff --git a/lib/libproc/tests/Makefile b/lib/libproc/tests/Makefile
@@ -6,7 +6,6 @@ PROGS=		target_prog
 SRCS_target_prog=	target_prog.c
 BINDIR_target_prog=	${TESTSDIR}
 
-WARNS?=		6
 LIBADD=	elf proc rtld_db util
 
 # Ensure that symbols aren't stripped from the test program, as they're needed

diff --git a/lib/libsbuf/tests/Makefile b/lib/libsbuf/tests/Makefile
@@ -6,6 +6,4 @@ ATF_TESTS_C+=	sbuf_string_test
 
 LIBADD+=	sbuf util
 
-WARNS?=		6
-
 .include <bsd.test.mk>
diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc
@@ -3,5 +3,4 @@
 
 BINDIR?=	/usr/libexec
 
-WARNS?=		6
 WFORMAT?=	1
diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile
@@ -7,7 +7,6 @@ SRCS=	main.c init.c subr.c chat.c
 LIBADD=	util
 MAN=	gettytab.5 ttys.5 getty.8
 
-WARNS?=	6
 WFORMAT=0
 
 .include <bsd.prog.mk>

diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
@@ -40,7 +40,6 @@ RTLD_ARCH=	${MACHINE_CPUARCH}
 CFLAGS+=	-I${RTLD_ELF_DIR}/${RTLD_ARCH} -I${RTLD_ELF_DIR}
 
 NO_WCAST_ALIGN=	yes
-WARNS?=		6
 INSTALLFLAGS=	-C -b
 PRECIOUSPROG=
 BINDIR=		/libexec

diff --git a/libexec/rtld-elf/tests/libpythagoras/Makefile b/libexec/rtld-elf/tests/libpythagoras/Makefile
@@ -10,7 +10,6 @@ SHLIBDIR=	${TESTSBASE}/libexec/rtld-elf
 
 SRCS=		pythagoras.c
 
-WARNS?=		6
 LIBADD=		m
 
 .include <bsd.lib.mk>
diff --git a/libexec/tftpd/tests/Makefile b/libexec/tftpd/tests/Makefile
@@ -6,7 +6,6 @@ ATF_TESTS_C=	functional
 TEST_METADATA.functional+=	timeout=15
 
 LIBADD=	util
-WARNS?=	6
 CSTD=	c11
 
 .include <bsd.test.mk>
diff --git a/sbin/decryptcore/Makefile b/sbin/decryptcore/Makefile
@@ -8,6 +8,4 @@ MAN=	decryptcore.8
 
 CFLAGS+=-I${SRCTOP}/lib/libpjdlog
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/sbin/pfilctl/Makefile b/sbin/pfilctl/Makefile
@@ -2,7 +2,6 @@
 
 PROG=	pfilctl
 SRCS=	pfilctl.c
-WARNS?=	6
 
 MAN=	pfilctl.8
 

diff --git a/sbin/ping/tests/Makefile b/sbin/ping/tests/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-WARNS?=	6
-
 ATF_TESTS_C+=	in_cksum_test
 SRCS.in_cksum_test= in_cksum_test.c ../utils.c
 

diff --git a/sbin/recoverdisk/Makefile b/sbin/recoverdisk/Makefile
@@ -5,8 +5,6 @@ PROG=	recoverdisk
 
 LDFLAGS += -lm
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
 
 test:	${PROG}

diff --git a/sys/teken/demo/Makefile b/sys/teken/demo/Makefile
@@ -4,6 +4,4 @@ PROG=	teken_demo
 LDADD=	-lncursesw -lteken -lutil
 MAN=
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/sys/teken/libteken/Makefile b/sys/teken/libteken/Makefile
@@ -4,7 +4,6 @@ LIB=	teken
 SHLIB_MAJOR= 0
 
 CFLAGS+=-I.
-WARNS?=	6
 
 SRCDIR=	${.CURDIR}/..
 .PATH: ${SRCDIR}

diff --git a/sys/teken/stress/Makefile b/sys/teken/stress/Makefile
@@ -4,6 +4,4 @@ PROG=	teken_stress
 LDADD=	-lteken
 MAN=
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/tests/sys/Makefile.inc b/tests/sys/Makefile.inc
@@ -1,5 +1,3 @@
 # $FreeBSD$
 
-WARNS?=		6
-
 .include "${SRCTOP}/tests/Makefile.inc0"
diff --git a/tests/sys/aio/Makefile b/tests/sys/aio/Makefile
@@ -17,6 +17,4 @@ LIBADD.lio_test+=	rt
 
 CFLAGS+=	-I${.CURDIR:H:H}
 
-WARNS?=	6
-
 .include <bsd.test.mk>
diff --git a/tests/sys/audit/Makefile b/tests/sys/audit/Makefile
@@ -51,8 +51,6 @@ TEST_METADATA+= required_user="root"
 TEST_METADATA+= is_exclusive="true"
 TEST_METADATA+=	required_files="/etc/rc.d/auditd /dev/auditpipe"
 
-WARNS?=	6
-
 LDFLAGS+=	-lbsm -lutil
 
 CFLAGS.process-control.c+=	-I${SRCTOP}/tests

diff --git a/tests/sys/auditpipe/Makefile b/tests/sys/auditpipe/Makefile
@@ -6,6 +6,5 @@ ATF_TESTS_C=	auditpipe_test
 
 TEST_METADATA+= required_user="root"
 TEST_METADATA+= required_files="/dev/auditpipe"
-WARNS?=	6
 
 .include <bsd.test.mk>
diff --git a/tests/sys/capsicum/Makefile b/tests/sys/capsicum/Makefile
@@ -52,6 +52,4 @@ WARNS.capsicum-test=	3
 
 .endif
 
-WARNS?=	6
-
 .include <bsd.test.mk>
diff --git a/tests/sys/devrandom/Makefile b/tests/sys/devrandom/Makefile
@@ -6,7 +6,6 @@ SDEVRANDOM=	${SRCTOP}/sys/dev/random
 .PATH:		${SDEVRANDOM}
 
 TESTSDIR=	${TESTSBASE}/sys/devrandom
-WARNS?=	6
 
 CFLAGS+=	-I${SRCTOP}/sys
 

diff --git a/tests/sys/fs/fusefs/Makefile b/tests/sys/fs/fusefs/Makefile
@@ -82,6 +82,4 @@ LIBADD+=	pthread
 LIBADD+=	gmock gtest
 LIBADD+=	util
 
-WARNS?=	6
-
 .include <bsd.test.mk>
diff --git a/tests/sys/kern/pipe/Makefile b/tests/sys/kern/pipe/Makefile
@@ -12,6 +12,4 @@ PLAIN_TESTS_C+= pipe_reverse2_test
 PLAIN_TESTS_C+= pipe_reverse_test
 PLAIN_TESTS_C+= pipe_wraparound_test
 
-WARNS?=		6
-
 .include <bsd.test.mk>
diff --git a/tests/sys/mqueue/Makefile b/tests/sys/mqueue/Makefile
@@ -16,6 +16,4 @@ PROGS+=		mqtest5
 
 LIBADD+=	rt
 
-WARNS?=		6
-
 .include <bsd.test.mk>
diff --git a/tests/sys/net/Makefile b/tests/sys/net/Makefile
@@ -25,6 +25,4 @@ PROGS+=		randsleep
 
 CFLAGS+=        -I${.CURDIR:H:H}
 
-WARNS?=		6
-
 .include <bsd.test.mk>
diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile
@@ -20,6 +20,4 @@ ${PACKAGE}FILESMODE_redirect.py=0555
 
 MAN=
 
-WARNS?=	6
-
 .include <bsd.test.mk>
diff --git a/tests/sys/netmap/Makefile b/tests/sys/netmap/Makefile
@@ -11,6 +11,4 @@ PLAIN_TESTS_C+=	ctrl-api-test
 CFLAGS+=	-I${SRCTOP}/tests
 LIBADD+= 	pthread
 
-WARNS?=		6
-
 .include <bsd.test.mk>
diff --git a/tests/sys/opencrypto/Makefile b/tests/sys/opencrypto/Makefile
@@ -21,6 +21,4 @@ PYMODULES=	cryptodev.py cryptodevh.py cryptotest.py
 
 ${PACKAGE}FILES+=	${PYMODULES}
 
-WARNS?=	6
-
 .include <bsd.test.mk>
diff --git a/tests/sys/pjdfstest/pjdfstest/Makefile b/tests/sys/pjdfstest/pjdfstest/Makefile
@@ -10,6 +10,4 @@ MAN=
 
 CFLAGS+=	-I${.CURDIR:H}
 
-WARNS?=		6
-
 .include <bsd.prog.mk>
diff --git a/tools/regression/aio/aiop/Makefile b/tools/regression/aio/aiop/Makefile
@@ -3,6 +3,4 @@
 PROG=	aiop
 MAN=
 
-WARNS=	6
-
 .include <bsd.prog.mk>
diff --git a/tools/regression/bpf/bpf_filter/Makefile b/tools/regression/bpf/bpf_filter/Makefile
@@ -46,7 +46,6 @@ SRCS+=		${SYSDIR}/net/bpf_jitter.c	\
 		${SYSDIR}/${MACHINE_ARCH}/${MACHINE_ARCH}/bpf_jit_machdep.c
 CFLAGS+=	-DBPF_JIT_COMPILER
 LIBS+=		-lutil
-WARNS?=		6
 .else
 SRCS+=		${SYSDIR}/net/bpf_filter.c
 WARNS?=		2

diff --git a/tools/regression/doat/Makefile b/tools/regression/doat/Makefile
@@ -3,6 +3,5 @@
 PROG=	doat
 
 MAN=
-WARNS?=6
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/geom_gpt/Makefile b/tools/regression/geom_gpt/Makefile
@@ -5,6 +5,4 @@ MAN=
 
 LIBADD+=	geom
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/tools/regression/include/stdatomic/Makefile b/tools/regression/include/stdatomic/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PROG=	logic
-WARNS=6
 MAN=
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/netinet/ipbroadcast/Makefile b/tools/regression/netinet/ipbroadcast/Makefile
@@ -5,6 +5,4 @@
 PROG=	ipbroadcast
 MAN=
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/tools/regression/rpcsec_gss/Makefile b/tools/regression/rpcsec_gss/Makefile
@@ -2,7 +2,6 @@
 
 PROG=	rpctest
 MAN=
-WARNS?=	6
 LIBADD=	rpcsec_gss
 DEBUG_FLAGS= -g -O0
 

diff --git a/tools/regression/sockets/accept_fd_leak/Makefile b/tools/regression/sockets/accept_fd_leak/Makefile
@@ -4,6 +4,5 @@
 
 PROG=	accept_fd_leak
 MAN=
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/sockets/accf_data_attach/Makefile b/tools/regression/sockets/accf_data_attach/Makefile
@@ -4,6 +4,5 @@
 
 PROG=	accf_data_attach
 MAN=
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/sockets/fstat/Makefile b/tools/regression/sockets/fstat/Makefile
@@ -4,6 +4,5 @@
 
 PROG=	fstat
 MAN=
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/sockets/kqueue/Makefile b/tools/regression/sockets/kqueue/Makefile
@@ -4,6 +4,5 @@
 
 PROG=	kqueue
 MAN=
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/sockets/listen_backlog/Makefile b/tools/regression/sockets/listen_backlog/Makefile
@@ -2,6 +2,5 @@
 
 PROG=	listen_backlog
 MAN=
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/sockets/listen_kqueue/Makefile b/tools/regression/sockets/listen_kqueue/Makefile
@@ -2,6 +2,5 @@
 
 PROG=	listen_kqueue
 MAN=
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/sockets/listenclose/Makefile b/tools/regression/sockets/listenclose/Makefile
@@ -4,6 +4,5 @@
 
 PROG=	listenclose
 MAN=
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/sockets/pr_atomic/Makefile b/tools/regression/sockets/pr_atomic/Makefile
@@ -2,6 +2,5 @@
 
 PROG=	pr_atomic
 MAN=
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/sockets/reconnect/Makefile b/tools/regression/sockets/reconnect/Makefile
@@ -4,6 +4,5 @@
 
 PROG=	reconnect
 MAN=
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/sockets/rtsocket/Makefile b/tools/regression/sockets/rtsocket/Makefile
@@ -2,6 +2,5 @@
 
 PROG=	rtsocket
 MAN=
-WARNS?=	6
 
 .include <bsd.prog.mk>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,5 +10,3 @@ CXXFLAGS+= ${GTESTS_FLAGS}

		# Silence warnings about usage of deprecated std::auto_ptr
		CXXWARNFLAGS+= -Wno-deprecated-declarations

		WARNS?= 6
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,6 +5,4 @@ ATF_TESTS_C+= cam_test

		LIBADD+= cam

		WARNS?= 6

		.include <bsd.test.mk>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,6 +6,4 @@ ATF_TESTS_C+= sbuf_string_test

		LIBADD+= sbuf util

		WARNS?= 6

		.include <bsd.test.mk>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,5 +3,4 @@

		BINDIR?= /usr/libexec

		WARNS?= 6
		WFORMAT?= 1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,6 +8,4 @@ MAN= decryptcore.8

		CFLAGS+=-I${SRCTOP}/lib/libpjdlog

		WARNS?= 6

		.include <bsd.prog.mk>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,6 +17,4 @@ LIBADD.lio_test+= rt

		CFLAGS+= -I${.CURDIR:H:H}

		WARNS?= 6

		.include <bsd.test.mk>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,6 +52,4 @@ WARNS.capsicum-test= 3

		.endif

		WARNS?= 6

		.include <bsd.test.mk>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,4 @@ PROGS+= mqtest5

		LIBADD+= rt

		WARNS?= 6

		.include <bsd.test.mk>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,6 +25,4 @@ PROGS+= randsleep

		CFLAGS+= -I${.CURDIR:H:H}

		WARNS?= 6

		.include <bsd.test.mk>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,6 +20,4 @@ ${PACKAGE}FILESMODE_redirect.py=0555

		MAN=

		WARNS?= 6

		.include <bsd.test.mk>