diff options
author | ru <ru@FreeBSD.org> | 2009-10-19 16:00:24 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2009-10-19 16:00:24 +0000 |
commit | 763b9ae1f84c34313cd6617611f6269bfa151b66 (patch) | |
tree | e4ddc2d8bac2fea0bfd2aabd8451289e9adf00ae | |
parent | 85b92382975dcce3c4e75db4f6d039ac9c2ce510 (diff) | |
download | FreeBSD-src-763b9ae1f84c34313cd6617611f6269bfa151b66.zip FreeBSD-src-763b9ae1f84c34313cd6617611f6269bfa151b66.tar.gz |
Switch the default WARNS level for sbin/ to 6.
Submitted by: Ulrich Spörlein
51 files changed, 25 insertions, 39 deletions
diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc index 70d6584..e506f9c 100644 --- a/sbin/Makefile.inc +++ b/sbin/Makefile.inc @@ -4,7 +4,7 @@ .include <bsd.own.mk> BINDIR?= /sbin -WARNS?= 2 +WARNS?= 6 .if ${MK_DYNAMICROOT} == "no" NO_SHARED?= YES diff --git a/sbin/adjkerntz/Makefile b/sbin/adjkerntz/Makefile index 27c1289..8e504e9 100644 --- a/sbin/adjkerntz/Makefile +++ b/sbin/adjkerntz/Makefile @@ -2,5 +2,6 @@ PROG= adjkerntz MAN= adjkerntz.8 +WARNS?= 2 .include <bsd.prog.mk> diff --git a/sbin/atacontrol/Makefile b/sbin/atacontrol/Makefile index 73b9160..9881273 100644 --- a/sbin/atacontrol/Makefile +++ b/sbin/atacontrol/Makefile @@ -2,6 +2,5 @@ PROG= atacontrol MAN= atacontrol.8 -WARNS?= 6 .include <bsd.prog.mk> diff --git a/sbin/atm/atmconfig/Makefile b/sbin/atm/atmconfig/Makefile index 1db0fa4..8564d35 100644 --- a/sbin/atm/atmconfig/Makefile +++ b/sbin/atm/atmconfig/Makefile @@ -29,8 +29,6 @@ CLEANFILES+= oid.h .if ${MACHINE_ARCH} == "arm" WARNS?= 3 -.else -WARNS?= 6 .endif FILES= atmconfig.help atmconfig_device.help diff --git a/sbin/badsect/Makefile b/sbin/badsect/Makefile index a392277..b6cb545 100644 --- a/sbin/badsect/Makefile +++ b/sbin/badsect/Makefile @@ -5,5 +5,6 @@ PROG= badsect DPADD= ${LIBUFS} LDADD= -lufs MAN= badsect.8 +WARNS?= 2 .include <bsd.prog.mk> diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile index 562b0f3..b60bbd0 100644 --- a/sbin/bsdlabel/Makefile +++ b/sbin/bsdlabel/Makefile @@ -13,6 +13,7 @@ LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel MLINKS= bsdlabel.8 disklabel.8 .endif +WARNS?= 2 DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} LDADD= -lgeom -lbsdxml -lsbuf diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile index 7a3d421..31bbd46 100644 --- a/sbin/camcontrol/Makefile +++ b/sbin/camcontrol/Makefile @@ -9,8 +9,6 @@ CFLAGS+= -DMINIMALISTIC .endif .if ${MACHINE_ARCH} == "arm" WARNS?= 3 -.else -WARNS?= 6 .endif DPADD= ${LIBCAM} ${LIBSBUF} ${LIBUTIL} LDADD= -lcam -lsbuf -lutil diff --git a/sbin/ccdconfig/Makefile b/sbin/ccdconfig/Makefile index ac75584..0feca54 100644 --- a/sbin/ccdconfig/Makefile +++ b/sbin/ccdconfig/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= ccdconfig -WARNS?= 6 MAN= ccdconfig.8 DPADD= ${LIBGEOM} diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile index c68c312..1ae0cf4 100644 --- a/sbin/clri/Makefile +++ b/sbin/clri/Makefile @@ -3,5 +3,6 @@ PROG= clri MAN= clri.8 +WARNS?= 2 .include <bsd.prog.mk> diff --git a/sbin/comcontrol/Makefile b/sbin/comcontrol/Makefile index a7720d8..d875756 100644 --- a/sbin/comcontrol/Makefile +++ b/sbin/comcontrol/Makefile @@ -3,6 +3,5 @@ PROG= comcontrol MAN= comcontrol.8 -WARNS?= 6 .include <bsd.prog.mk> diff --git a/sbin/conscontrol/Makefile b/sbin/conscontrol/Makefile index ddd2434..9014d80 100644 --- a/sbin/conscontrol/Makefile +++ b/sbin/conscontrol/Makefile @@ -2,5 +2,6 @@ PROG= conscontrol MAN= conscontrol.8 +WARNS?= 2 .include <bsd.prog.mk> diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile index 7e32326..434335b 100644 --- a/sbin/dhclient/Makefile +++ b/sbin/dhclient/Makefile @@ -40,4 +40,6 @@ SCRIPTS=dhclient-script MAN= dhclient.8 dhclient.conf.5 dhclient.leases.5 dhcp-options.5 \ dhclient-script.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/sbin/dmesg/Makefile b/sbin/dmesg/Makefile index 8472f56..266551b 100644 --- a/sbin/dmesg/Makefile +++ b/sbin/dmesg/Makefile @@ -4,8 +4,6 @@ PROG= dmesg MAN= dmesg.8 -WARNS?= 6 - LDADD= -lkvm DPADD= ${LIBKVM} diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile index 608162a..e3d9aef 100644 --- a/sbin/dump/Makefile +++ b/sbin/dump/Makefile @@ -19,5 +19,6 @@ CFLAGS+=-DRDUMP SRCS= itime.c main.c optr.c dumprmt.c tape.c traverse.c unctime.c cache.c MAN= dump.8 MLINKS= dump.8 rdump.8 +WARNS?= 2 .include <bsd.prog.mk> diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile index 99faa77..fe464e0 100644 --- a/sbin/dumpfs/Makefile +++ b/sbin/dumpfs/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PROG= dumpfs +WARNS?= 2 DPADD= ${LIBUFS} LDADD= -lufs MAN= dumpfs.8 diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile index c273f93..d11ccc7 100644 --- a/sbin/dumpon/Makefile +++ b/sbin/dumpon/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= dumpon -WARNS?= 6 MAN= dumpon.8 .include <bsd.prog.mk> diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile index fffb889..88b8240 100644 --- a/sbin/geom/Makefile +++ b/sbin/geom/Makefile @@ -11,6 +11,7 @@ PROG= geom SRCS= geom.c geom_label.c geom_part.c subr.c NO_MAN= +WARNS?= 2 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core -DSTATIC_GEOM_CLASSES DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} diff --git a/sbin/geom/Makefile.inc b/sbin/geom/Makefile.inc index 94ca09f..bf9f05e 100644 --- a/sbin/geom/Makefile.inc +++ b/sbin/geom/Makefile.inc @@ -1,6 +1,5 @@ # $FreeBSD$ -WARNS?= 6 CLASS_DIR?=/lib/geom .include "../Makefile.inc" diff --git a/sbin/ggate/Makefile.inc b/sbin/ggate/Makefile.inc index e55271f..265f86d 100644 --- a/sbin/ggate/Makefile.inc +++ b/sbin/ggate/Makefile.inc @@ -1,5 +1,3 @@ # $FreeBSD$ -WARNS?= 6 - .include "../Makefile.inc" diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile index a5e9937..a875ce5 100644 --- a/sbin/growfs/Makefile +++ b/sbin/growfs/Makefile @@ -10,8 +10,6 @@ PROG= growfs SRCS= growfs.c MAN= growfs.8 -WARNS?= 6 - .if defined(GFSDBG) SRCS+= debug.c .endif diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile index 6d41497..e4bf4a7 100644 --- a/sbin/gvinum/Makefile +++ b/sbin/gvinum/Makefile @@ -4,6 +4,7 @@ PROG= gvinum SRCS= gvinum.c gvinum.h geom_vinum_share.c MAN= gvinum.8 +WARNS?= 2 CFLAGS+= -I${.CURDIR}/../../sys DPADD= ${LIBREADLINE} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} diff --git a/sbin/init/Makefile b/sbin/init/Makefile index 58a9e0a..7497a4b 100644 --- a/sbin/init/Makefile +++ b/sbin/init/Makefile @@ -5,7 +5,6 @@ PROG= init MAN= init.8 PRECIOUSPROG= INSTALLFLAGS=-b -B.bak -WARNS?= 6 CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT DPADD= ${LIBUTIL} ${LIBCRYPT} LDADD= -lutil -lcrypt diff --git a/sbin/ipf/Makefile.inc b/sbin/ipf/Makefile.inc index 3373b55..0065ce7 100644 --- a/sbin/ipf/Makefile.inc +++ b/sbin/ipf/Makefile.inc @@ -1,5 +1,7 @@ # $FreeBSD$ +WARNS?= 2 + CFLAGS+= -I${.CURDIR}/../../../contrib/ipfilter CFLAGS+= -I${.CURDIR}/../../../contrib/ipfilter/tools CFLAGS+= -I${.CURDIR}/../../../sys diff --git a/sbin/iscontrol/Makefile b/sbin/iscontrol/Makefile index 2b09fa9..446a5f4 100644 --- a/sbin/iscontrol/Makefile +++ b/sbin/iscontrol/Makefile @@ -5,6 +5,7 @@ PROG= iscontrol DPADD= ${LIBCAM} ${LIBMD} LDADD= -lcam -lmd +WARNS?= 2 CFLAGS += -I${.CURDIR}/../../sys/dev/iscsi/initiator #CFLAGS += -g -DDEBUG diff --git a/sbin/kldunload/Makefile b/sbin/kldunload/Makefile index 48e5c03..1a25a02 100644 --- a/sbin/kldunload/Makefile +++ b/sbin/kldunload/Makefile @@ -28,6 +28,5 @@ PROG= kldunload MAN= kldunload.8 -WARNS?= 6 .include <bsd.prog.mk> diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile index 442ae63..15c3808 100644 --- a/sbin/ldconfig/Makefile +++ b/sbin/ldconfig/Makefile @@ -3,7 +3,6 @@ PROG= ldconfig SRCS= elfhints.c ldconfig.c shlib.c support.c LDDIR?= ${.CURDIR}/../../libexec/rtld-aout -WARNS?= 6 CFLAGS+=-I${LDDIR} -DFREEBSD_AOUT MAN= ldconfig.8 diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile index 07c4109..7df4d85 100644 --- a/sbin/md5/Makefile +++ b/sbin/md5/Makefile @@ -11,7 +11,6 @@ MLINKS= md5.1 rmd160.1 \ md5.1 sha1.1 \ md5.1 sha256.1 -WARNS?= 6 WFORMAT?= 1 DPADD= ${LIBMD} diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile index f4d8adc..11223f2 100644 --- a/sbin/mdconfig/Makefile +++ b/sbin/mdconfig/Makefile @@ -4,6 +4,7 @@ PROG= mdconfig MAN= mdconfig.8 MLINKS= mdconfig.8 vnconfig.8 +WARNS?= 2 DPADD= ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} LDADD= -lutil -lgeom -lbsdxml -lsbuf diff --git a/sbin/mdmfs/Makefile b/sbin/mdmfs/Makefile index 1ef7084..999793f 100644 --- a/sbin/mdmfs/Makefile +++ b/sbin/mdmfs/Makefile @@ -4,6 +4,5 @@ PROG= mdmfs LINKS= ${BINDIR}/${PROG} ${BINDIR}/mount_mfs MAN= mdmfs.8 MLINKS+= mdmfs.8 mount_mfs.8 -WARNS?= 6 .include <bsd.prog.mk> diff --git a/sbin/mksnap_ffs/Makefile b/sbin/mksnap_ffs/Makefile index 40b56b4..9247cb2 100644 --- a/sbin/mksnap_ffs/Makefile +++ b/sbin/mksnap_ffs/Makefile @@ -6,6 +6,7 @@ PROG= mksnap_ffs SRCS= mksnap_ffs.c getmntopts.c MAN= mksnap_ffs.8 +WARNS?= 2 CFLAGS+=-I${.CURDIR}/../mount .if defined(NOSUID) diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile index 4186f00..8f6299a 100644 --- a/sbin/mount/Makefile +++ b/sbin/mount/Makefile @@ -3,7 +3,6 @@ PROG= mount SRCS= mount.c mount_fs.c getmntopts.c vfslist.c -WARNS?= 6 MAN= mount.8 # We do NOT install the getmntopts.3 man page. diff --git a/sbin/mount_autofs/Makefile b/sbin/mount_autofs/Makefile index e7d040d..b05d961 100644 --- a/sbin/mount_autofs/Makefile +++ b/sbin/mount_autofs/Makefile @@ -4,5 +4,6 @@ PROG=mount_autofs MAN=mount_autofs.8 BINDIR?=/sbin +WARNS?= 2 .include <bsd.prog.mk> diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile index 0602d9b..b889174 100644 --- a/sbin/mount_cd9660/Makefile +++ b/sbin/mount_cd9660/Makefile @@ -9,7 +9,6 @@ LDADD= -lkiconv MOUNT= ${.CURDIR}/../mount CFLAGS+= -I${MOUNT} -WARNS?= 6 # Needs to be dynamically linked for optional dlopen() access to # userland libiconv diff --git a/sbin/mount_ext2fs/Makefile b/sbin/mount_ext2fs/Makefile index 3eefb92..08a0c3c 100644 --- a/sbin/mount_ext2fs/Makefile +++ b/sbin/mount_ext2fs/Makefile @@ -5,6 +5,7 @@ PROG= mount_ext2fs SRCS= mount_ext2fs.c getmntopts.c MAN= mount_ext2fs.8 +WARNS?= 2 MOUNT= ${.CURDIR}/../mount CFLAGS+= -I${MOUNT} diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile index 8752f0d..c3e416a 100644 --- a/sbin/mount_msdosfs/Makefile +++ b/sbin/mount_msdosfs/Makefile @@ -10,7 +10,6 @@ LDADD= -lkiconv MOUNT= ${.CURDIR}/../mount CFLAGS+= -I${MOUNT} -WARNS?= 6 # Needs to be dynamically linked for optional dlopen() access to # userland libiconv diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile index 5e92c5b..0b2ecc5 100644 --- a/sbin/mount_nullfs/Makefile +++ b/sbin/mount_nullfs/Makefile @@ -7,7 +7,6 @@ MAN= mount_nullfs.8 MOUNT= ${.CURDIR}/../mount CFLAGS+=-I${MOUNT} -WARNS?= 6 .PATH: ${MOUNT} diff --git a/sbin/mount_reiserfs/Makefile b/sbin/mount_reiserfs/Makefile index bd11a4b..686629f 100644 --- a/sbin/mount_reiserfs/Makefile +++ b/sbin/mount_reiserfs/Makefile @@ -7,7 +7,6 @@ MAN = mount_reiserfs.8 # mount_reiserfs needs mntopts.h and getmntopts.c from src/sbin/mount/ MOUNT ?= ${.CURDIR}/../mount CFLAGS += -I${MOUNT} -WARNS ?= 6 .PATH: ${MOUNT} diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile index 35158ab..276fc74 100644 --- a/sbin/mount_unionfs/Makefile +++ b/sbin/mount_unionfs/Makefile @@ -7,7 +7,6 @@ MAN= mount_unionfs.8 MOUNT= ${.CURDIR}/../mount CFLAGS+=-I${MOUNT} -WARNS?= 6 .PATH: ${MOUNT} diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile index 5ee8277..558f673 100644 --- a/sbin/newfs_msdos/Makefile +++ b/sbin/newfs_msdos/Makefile @@ -5,8 +5,6 @@ MAN= newfs_msdos.8 .if ${MACHINE_ARCH} == "arm" WARNS?= 3 -.else -WARNS?= 6 .endif .include <bsd.prog.mk> diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile index 22717c5..47cd290 100644 --- a/sbin/nfsiod/Makefile +++ b/sbin/nfsiod/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= nfsiod -WARNS?= 6 MAN= nfsiod.8 .include <bsd.prog.mk> diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile index ee57051..2475baf 100644 --- a/sbin/pfctl/Makefile +++ b/sbin/pfctl/Makefile @@ -12,6 +12,7 @@ SRCS+= pfctl_osfp.c pfctl_radix.c pfctl_table.c pfctl_qstats.c SRCS+= pfctl_optimize.c SRCS+= pf_ruleset.c +WARNS?= 2 CFLAGS+= -Wall -Wmissing-prototypes -Wno-uninitialized CFLAGS+= -Wstrict-prototypes -I${.CURDIR}/../../contrib/pf/pfctl diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile index 2ca64cc..b71aa4b 100644 --- a/sbin/rcorder/Makefile +++ b/sbin/rcorder/Makefile @@ -8,7 +8,6 @@ MAN= rcorder.8 LDADD= -lutil DPADD= ${LIBUTIL} -WARNS?= 6 # XXX hack for make's hash.[ch] CFLAGS+= -DORDER -I. diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile index 42f0868..fe02f26 100644 --- a/sbin/reboot/Makefile +++ b/sbin/reboot/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= reboot -WARNS?= 6 DPADD= ${LIBUTIL} LDADD= -lutil MAN= reboot.8 nextboot.8 diff --git a/sbin/recoverdisk/Makefile b/sbin/recoverdisk/Makefile index 6733a4f..136e570 100644 --- a/sbin/recoverdisk/Makefile +++ b/sbin/recoverdisk/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= recoverdisk -WARNS?= 6 .include <bsd.prog.mk> diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile index 99b07f5..8c7559f 100644 --- a/sbin/routed/Makefile +++ b/sbin/routed/Makefile @@ -7,9 +7,7 @@ MAN= routed.8 SUBDIR= rtquery LDADD= -lmd DPADD= ${LIBMD} -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" -WARNS?= 6 -.else +.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "amd64" WARNS?= 0 .endif diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile index 525f281..f257458 100644 --- a/sbin/savecore/Makefile +++ b/sbin/savecore/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= savecore -WARNS?= 6 DPADD= ${LIBZ} LDADD= -lz MAN= savecore.8 diff --git a/sbin/sconfig/Makefile b/sbin/sconfig/Makefile index 5923692..9698c04 100644 --- a/sbin/sconfig/Makefile +++ b/sbin/sconfig/Makefile @@ -4,5 +4,6 @@ PROG= sconfig MAN= sconfig.8 MANSUBDIR= /i386 +WARNS?= 2 .include <bsd.prog.mk> diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile index b7f232d..09b0b3e 100644 --- a/sbin/shutdown/Makefile +++ b/sbin/shutdown/Makefile @@ -4,8 +4,6 @@ PROG= shutdown MAN= shutdown.8 -WARNS?= 6 - BINOWN= root BINGRP= operator BINMODE=4550 diff --git a/sbin/spppcontrol/Makefile b/sbin/spppcontrol/Makefile index b394c39..3287fcf 100644 --- a/sbin/spppcontrol/Makefile +++ b/sbin/spppcontrol/Makefile @@ -2,5 +2,6 @@ PROG= spppcontrol MAN= spppcontrol.8 +WARNS?= 2 .include <bsd.prog.mk> diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile index 6f8e8df..09f54b7 100644 --- a/sbin/swapon/Makefile +++ b/sbin/swapon/Makefile @@ -8,6 +8,7 @@ LINKS+= ${BINDIR}/swapon ${BINDIR}/swapctl MLINKS= swapon.8 swapoff.8 MLINKS+=swapon.8 swapctl.8 +WARNS?= 2 DPADD= ${LIBUTIL} LDADD= -lutil diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile index d501d10..dc9fac6 100644 --- a/sbin/tunefs/Makefile +++ b/sbin/tunefs/Makefile @@ -5,5 +5,6 @@ PROG= tunefs DPADD= ${LIBUFS} LDADD= -lufs MAN= tunefs.8 +WARNS?= 2 .include <bsd.prog.mk> |