From b963db4652a0bf1718825e8e1a9bc93e87b7a80f Mon Sep 17 00:00:00 2001 From: delphij Date: Fri, 11 Dec 2009 23:35:38 +0000 Subject: Remove unneeded header includes from usr.bin/ except contributed code. Tested with: make universe --- usr.bin/ar/util.c | 1 - usr.bin/c89/c89.c | 1 - usr.bin/calendar/calendar.c | 1 - usr.bin/calendar/day.c | 1 - usr.bin/calendar/ostern.c | 1 - usr.bin/calendar/paskha.c | 1 - usr.bin/cksum/Makefile | 1 + usr.bin/cksum/crc.c | 1 - usr.bin/cksum/crc32.c | 1 - usr.bin/cksum/sum1.c | 1 - usr.bin/cksum/sum2.c | 1 - usr.bin/cmp/regular.c | 2 -- usr.bin/cmp/special.c | 1 - usr.bin/colcrt/colcrt.c | 1 - usr.bin/colrm/colrm.c | 3 --- usr.bin/compress/zopen.c | 2 -- usr.bin/cpuset/cpuset.c | 1 - usr.bin/expand/expand.c | 1 - usr.bin/fetch/fetch.c | 1 - usr.bin/file2c/file2c.c | 1 - usr.bin/find/find.c | 1 - usr.bin/find/getdate.y | 1 - usr.bin/find/ls.c | 1 - usr.bin/find/main.c | 1 - usr.bin/find/misc.c | 1 - usr.bin/find/option.c | 1 - usr.bin/finger/lprint.c | 2 +- usr.bin/finger/net.c | 2 +- usr.bin/finger/util.c | 2 +- usr.bin/fmt/fmt.c | 1 - usr.bin/fold/fold.c | 1 - usr.bin/gcore/gcore.c | 1 - usr.bin/getopt/getopt.c | 1 - usr.bin/hexdump/display.c | 1 - usr.bin/hexdump/hexdump.c | 1 - usr.bin/jot/jot.c | 1 - usr.bin/killall/killall.c | 2 -- usr.bin/ktrace/subr.c | 2 -- usr.bin/lastcomm/lastcomm.c | 3 --- usr.bin/lastcomm/pathnames.h | 4 ++-- usr.bin/lastcomm/readrec.c | 4 ---- usr.bin/limits/limits.c | 1 - usr.bin/lock/lock.c | 1 - usr.bin/login/login.c | 2 +- usr.bin/login/login_fbtab.c | 1 - usr.bin/login/pathnames.h | 2 -- usr.bin/mesg/mesg.c | 1 - usr.bin/mkfifo/mkfifo.c | 1 - usr.bin/mklocale/yacc.y | 1 - usr.bin/mktemp/mktemp.c | 2 +- usr.bin/ncal/ncal.c | 1 - usr.bin/netstat/atalk.c | 2 -- usr.bin/netstat/bpf.c | 1 - usr.bin/netstat/if.c | 1 - usr.bin/netstat/ipsec.c | 2 -- usr.bin/netstat/ipx.c | 2 -- usr.bin/netstat/main.c | 2 -- usr.bin/netstat/mbuf.c | 2 -- usr.bin/netstat/netgraph.c | 2 -- usr.bin/netstat/pfkey.c | 2 -- usr.bin/netstat/route.c | 1 - usr.bin/netstat/sctp.c | 3 --- usr.bin/newgrp/newgrp.c | 2 -- usr.bin/newkey/update.c | 1 - usr.bin/nfsstat/nfsstat.c | 2 -- usr.bin/nohup/nohup.c | 1 - usr.bin/passwd/passwd.c | 1 - usr.bin/paste/paste.c | 3 --- usr.bin/pr/egetopt.c | 3 --- usr.bin/procstat/procstat_args.c | 1 - usr.bin/procstat/procstat_basic.c | 1 - usr.bin/procstat/procstat_files.c | 1 - usr.bin/procstat/procstat_vm.c | 1 - usr.bin/rev/rev.c | 2 -- usr.bin/rlogin/rlogin.c | 2 -- usr.bin/rpcgen/rpc_clntout.c | 1 - usr.bin/rpcgen/rpc_hout.c | 1 - usr.bin/rpcgen/rpc_tblout.c | 1 - usr.bin/rpcgen/rpc_util.c | 1 - usr.bin/ruptime/ruptime.c | 1 - usr.bin/rwall/rwall.c | 1 - usr.bin/sed/main.c | 2 -- usr.bin/sed/misc.c | 6 ------ usr.bin/showmount/showmount.c | 1 - usr.bin/su/su.c | 1 - usr.bin/systat/fetch.c | 1 - usr.bin/systat/icmp.c | 2 -- usr.bin/systat/iostat.c | 1 - usr.bin/systat/ip.c | 4 ---- usr.bin/systat/main.c | 1 - usr.bin/systat/mbufs.c | 1 - usr.bin/systat/mode.c | 2 -- usr.bin/systat/netstat.c | 1 - usr.bin/systat/swap.c | 1 - usr.bin/systat/tcp.c | 2 -- usr.bin/systat/vmstat.c | 1 - usr.bin/tar/getdate.c | 2 -- usr.bin/tee/tee.c | 1 - usr.bin/time/time.c | 1 - usr.bin/tput/tput.c | 2 -- usr.bin/tr/cmap.c | 3 --- usr.bin/tr/cmap.h | 1 - usr.bin/tr/cset.c | 3 --- usr.bin/tr/cset.h | 1 - usr.bin/tr/str.c | 2 -- usr.bin/tr/tr.c | 4 ---- usr.bin/truss/main.c | 2 -- usr.bin/truss/setup.c | 4 ---- usr.bin/tsort/tsort.c | 1 - usr.bin/ul/ul.c | 1 - usr.bin/unexpand/unexpand.c | 2 -- usr.bin/usbhidaction/usbhidaction.c | 1 - usr.bin/vis/foldit.c | 6 +----- usr.bin/w/pr_time.c | 1 - usr.bin/w/w.c | 3 --- usr.bin/wall/ttymsg.c | 1 - usr.bin/who/who.c | 1 - usr.bin/xinstall/xinstall.c | 21 ++++++++++----------- usr.bin/ypcat/ypcat.c | 1 - usr.bin/ypmatch/ypmatch.c | 1 - usr.bin/ypwhich/ypwhich.c | 1 - 121 files changed, 19 insertions(+), 193 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/ar/util.c b/usr.bin/ar/util.c index e1230e3..621c2b8 100644 --- a/usr.bin/ar/util.c +++ b/usr.bin/ar/util.c @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include diff --git a/usr.bin/c89/c89.c b/usr.bin/c89/c89.c index a1dc9b2..f8c47c5 100644 --- a/usr.bin/c89/c89.c +++ b/usr.bin/c89/c89.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c index d1bb745..39f2c9c 100644 --- a/usr.bin/calendar/calendar.c +++ b/usr.bin/calendar/calendar.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "pathnames.h" #include "calendar.h" struct passwd *pw; diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c index d3f3c1e..e40481e 100644 --- a/usr.bin/calendar/day.c +++ b/usr.bin/calendar/day.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "pathnames.h" #include "calendar.h" struct tm *tp; diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c index 76e5933..93e9c07 100644 --- a/usr.bin/calendar/ostern.c +++ b/usr.bin/calendar/ostern.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "calendar.h" diff --git a/usr.bin/calendar/paskha.c b/usr.bin/calendar/paskha.c index d96ffc2..e713f5f 100644 --- a/usr.bin/calendar/paskha.c +++ b/usr.bin/calendar/paskha.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "calendar.h" diff --git a/usr.bin/cksum/Makefile b/usr.bin/cksum/Makefile index 828900a..7ba3803 100644 --- a/usr.bin/cksum/Makefile +++ b/usr.bin/cksum/Makefile @@ -5,5 +5,6 @@ PROG= cksum SRCS= cksum.c crc.c print.c sum1.c sum2.c crc32.c LINKS= ${BINDIR}/cksum ${BINDIR}/sum MLINKS= cksum.1 sum.1 +WARNS?= 6 .include diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c index d1f42f2..ee48278 100644 --- a/usr.bin/cksum/crc.c +++ b/usr.bin/cksum/crc.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include "extern.h" diff --git a/usr.bin/cksum/crc32.c b/usr.bin/cksum/crc32.c index cadbc17..eefa772 100644 --- a/usr.bin/cksum/crc32.c +++ b/usr.bin/cksum/crc32.c @@ -17,7 +17,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include "extern.h" diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c index 406b40e..e6dd910 100644 --- a/usr.bin/cksum/sum1.c +++ b/usr.bin/cksum/sum1.c @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include "extern.h" diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c index c179c62..b438062 100644 --- a/usr.bin/cksum/sum2.c +++ b/usr.bin/cksum/sum2.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include "extern.h" diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c index 814d933..555725a 100644 --- a/usr.bin/cmp/regular.c +++ b/usr.bin/cmp/regular.c @@ -45,12 +45,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include #include -#include #include #include "extern.h" diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c index bbe3cb1..e5e8325 100644 --- a/usr.bin/cmp/special.c +++ b/usr.bin/cmp/special.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "extern.h" diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c index 2ba4f39..f845251 100644 --- a/usr.bin/colcrt/colcrt.c +++ b/usr.bin/colcrt/colcrt.c @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c index 52dda90..399252a 100644 --- a/usr.bin/colrm/colrm.c +++ b/usr.bin/colrm/colrm.c @@ -48,12 +48,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include #include #include -#include #include #include diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c index f0ec887..92e0a97 100644 --- a/usr.bin/compress/zopen.c +++ b/usr.bin/compress/zopen.c @@ -67,13 +67,11 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include #include #include -#include #include "zopen.h" #define BITS 16 /* Default bits. */ diff --git a/usr.bin/cpuset/cpuset.c b/usr.bin/cpuset/cpuset.c index 35b13af..a2bcf88 100644 --- a/usr.bin/cpuset/cpuset.c +++ b/usr.bin/cpuset/cpuset.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include int cflag; int gflag; diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c index 6c99db8..9f04799 100644 --- a/usr.bin/expand/expand.c +++ b/usr.bin/expand/expand.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include /* * expand - expand tabs to equivalent spaces diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c index 2512a2e..8fe419b 100644 --- a/usr.bin/fetch/fetch.c +++ b/usr.bin/fetch/fetch.c @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c index e50bd1f..8affbd0 100644 --- a/usr.bin/file2c/file2c.c +++ b/usr.bin/file2c/file2c.c @@ -10,7 +10,6 @@ #include __FBSDID("$FreeBSD$"); -#include #include #include #include diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c index cc2d797..3171f8b 100644 --- a/usr.bin/find/find.c +++ b/usr.bin/find/find.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "find.h" diff --git a/usr.bin/find/getdate.y b/usr.bin/find/getdate.y index de7750c..0a7ab21 100644 --- a/usr.bin/find/getdate.y +++ b/usr.bin/find/getdate.y @@ -15,7 +15,6 @@ #include __FBSDID("$FreeBSD$"); -#include #include /* The code at the top of get_date which figures out the offset of the diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c index 88e4593..7b9d88f 100644 --- a/usr.bin/find/ls.c +++ b/usr.bin/find/ls.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c index 8e2b42c..9a0b9ce 100644 --- a/usr.bin/find/main.c +++ b/usr.bin/find/main.c @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c index 1532906..8fda57c 100644 --- a/usr.bin/find/misc.c +++ b/usr.bin/find/misc.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c index 7d06c91..6c76bbf 100644 --- a/usr.bin/find/option.c +++ b/usr.bin/find/option.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c index 848bbee..d656693 100644 --- a/usr.bin/finger/lprint.c +++ b/usr.bin/finger/lprint.c @@ -310,7 +310,7 @@ show_text(const char *directory, const char *file_name, const char *header) return(0); /* If short enough, and no newlines, show it on a single line.*/ - if (sb.st_size <= LINE_LEN - strlen(header) - 5) { + if (sb.st_size <= (int)(LINE_LEN - strlen(header) - 5)) { nr = read(fd, tbuf, sizeof(tbuf)); if (nr <= 0) { (void)close(fd); diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c index 5260a2d..703ff60 100644 --- a/usr.bin/finger/net.c +++ b/usr.bin/finger/net.c @@ -230,7 +230,7 @@ trying(const struct addrinfo *ai) printf("Trying %s...\n", buf); } -void +static void cleanup(int sig __unused) { #define ERRSTR "Timed out.\n" diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c index a84c711..3eabd34 100644 --- a/usr.bin/finger/util.c +++ b/usr.bin/finger/util.c @@ -120,7 +120,7 @@ enter_lastlog(PERSON *pn) } if (fd == -1 || lseek(fd, (long)pn->uid * sizeof(ll), SEEK_SET) != - (long)pn->uid * sizeof(ll) || + (off_t)(pn->uid * sizeof(ll)) || read(fd, (char *)&ll, sizeof(ll)) != sizeof(ll)) { /* as if never logged in */ ll.ll_line[0] = ll.ll_host[0] = '\0'; diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c index ed85c2e..1ce9334 100644 --- a/usr.bin/fmt/fmt.c +++ b/usr.bin/fmt/fmt.c @@ -180,7 +180,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c index 59d8fc5..6c7fafb 100644 --- a/usr.bin/fold/fold.c +++ b/usr.bin/fold/fold.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c index 35d5363..706620c 100644 --- a/usr.bin/gcore/gcore.c +++ b/usr.bin/gcore/gcore.c @@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "extern.h" diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c index d1671a7..d0355d8 100644 --- a/usr.bin/getopt/getopt.c +++ b/usr.bin/getopt/getopt.c @@ -7,7 +7,6 @@ __FBSDID("$FreeBSD$"); */ #include -#include #include int diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c index db04c49..3d6a6ea 100644 --- a/usr.bin/hexdump/display.c +++ b/usr.bin/hexdump/display.c @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "hexdump.h" enum _vflag vflag = FIRST; diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c index 2ed7c4b..a035531 100644 --- a/usr.bin/hexdump/hexdump.c +++ b/usr.bin/hexdump/hexdump.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "hexdump.h" diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c index 2e33d41..4cd7433 100644 --- a/usr.bin/jot/jot.c +++ b/usr.bin/jot/jot.c @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include /* Defaults */ diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c index 0a779fd..6ac53dd 100644 --- a/usr.bin/killall/killall.c +++ b/usr.bin/killall/killall.c @@ -34,8 +34,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include #include #include diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c index a9d3f64..4f41a13 100644 --- a/usr.bin/ktrace/subr.c +++ b/usr.bin/ktrace/subr.c @@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #include "ktrace.h" void timevaladd(struct timeval *, struct timeval *); diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c index 8c55123..b5ca6dd 100644 --- a/usr.bin/lastcomm/lastcomm.c +++ b/usr.bin/lastcomm/lastcomm.c @@ -51,9 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include -#include #include #include #include diff --git a/usr.bin/lastcomm/pathnames.h b/usr.bin/lastcomm/pathnames.h index 0737970..04af440 100644 --- a/usr.bin/lastcomm/pathnames.h +++ b/usr.bin/lastcomm/pathnames.h @@ -31,8 +31,8 @@ * SUCH DAMAGE. * * @(#)pathnames.h 8.1 (Berkeley) 6/6/93 + * + * $FreeBSD$ */ -#include - #define _PATH_ACCT "/var/account/acct" diff --git a/usr.bin/lastcomm/readrec.c b/usr.bin/lastcomm/readrec.c index 4883b2a..5de7c5c 100644 --- a/usr.bin/lastcomm/readrec.c +++ b/usr.bin/lastcomm/readrec.c @@ -33,13 +33,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include -#include #include #include -#include #include int readrec_forward(FILE *f, struct acctv2 *av2); diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c index 2da69a2..9c250f9 100644 --- a/usr.bin/limits/limits.c +++ b/usr.bin/limits/limits.c @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c index 3b19e35..d581284 100644 --- a/usr.bin/lock/lock.c +++ b/usr.bin/lock/lock.c @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c index 2a42924..dd63d92 100644 --- a/usr.bin/login/login.c +++ b/usr.bin/login/login.c @@ -64,8 +64,8 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include +#include #include #include #include diff --git a/usr.bin/login/login_fbtab.c b/usr.bin/login/login_fbtab.c index f6111a1..c3cb8f4 100644 --- a/usr.bin/login/login_fbtab.c +++ b/usr.bin/login/login_fbtab.c @@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "login.h" #include "pathnames.h" static void login_protect(const char *, char *, int, uid_t, gid_t); diff --git a/usr.bin/login/pathnames.h b/usr.bin/login/pathnames.h index 60fecc2..afb06ef 100644 --- a/usr.bin/login/pathnames.h +++ b/usr.bin/login/pathnames.h @@ -34,8 +34,6 @@ * $FreeBSD$ */ -#include - #define _PATH_HUSHLOGIN ".hushlogin" #define _PATH_MOTDFILE "/etc/motd" #define _PATH_FBTAB "/etc/fbtab" diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c index 270c1c5..7f891cc 100644 --- a/usr.bin/mesg/mesg.c +++ b/usr.bin/mesg/mesg.c @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include static void usage(void); diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c index 7e147b6..4686562 100644 --- a/usr.bin/mkfifo/mkfifo.c +++ b/usr.bin/mkfifo/mkfifo.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #define BASEMODE S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | \ diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y index 344af22..99d86e6 100644 --- a/usr.bin/mklocale/yacc.y +++ b/usr.bin/mklocale/yacc.y @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c index b58ac4b..72b89d6 100644 --- a/usr.bin/mktemp/mktemp.c +++ b/usr.bin/mktemp/mktemp.c @@ -143,7 +143,7 @@ main(int argc, char **argv) } static void -usage() +usage(void) { fprintf(stderr, "usage: mktemp [-d] [-q] [-t prefix] [-u] template ...\n"); diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c index a65a2fc..4699025 100644 --- a/usr.bin/ncal/ncal.c +++ b/usr.bin/ncal/ncal.c @@ -30,7 +30,6 @@ static const char rcsid[] = #endif /* not lint */ #include -#include #include #include #include diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c index 9ed4820..cf82020 100644 --- a/usr.bin/netstat/atalk.c +++ b/usr.bin/netstat/atalk.c @@ -52,8 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include #include #include diff --git a/usr.bin/netstat/bpf.c b/usr.bin/netstat/bpf.c index 2ffeacb..2f862e1 100644 --- a/usr.bin/netstat/bpf.c +++ b/usr.bin/netstat/bpf.c @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "netstat.h" diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index 02f390a..043a20f 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "netstat.h" diff --git a/usr.bin/netstat/ipsec.c b/usr.bin/netstat/ipsec.c index d3276bf..8aeeace 100644 --- a/usr.bin/netstat/ipsec.c +++ b/usr.bin/netstat/ipsec.c @@ -111,8 +111,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include "netstat.h" #ifdef IPSEC diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c index b79a93b..adc6cfb 100644 --- a/usr.bin/netstat/ipx.c +++ b/usr.bin/netstat/ipx.c @@ -64,8 +64,6 @@ __FBSDID("$FreeBSD$"); #define SANAMES #include -#include -#include #include #include #include diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index fec7172..23593d5 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -60,12 +60,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include #include -#include #include #include #include diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c index 7f65701..47a58c4 100644 --- a/usr.bin/netstat/mbuf.c +++ b/usr.bin/netstat/mbuf.c @@ -54,8 +54,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include "netstat.h" /* diff --git a/usr.bin/netstat/netgraph.c b/usr.bin/netstat/netgraph.c index c4dd647..adae25e 100644 --- a/usr.bin/netstat/netgraph.c +++ b/usr.bin/netstat/netgraph.c @@ -50,11 +50,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include -#include #include #include "netstat.h" diff --git a/usr.bin/netstat/pfkey.c b/usr.bin/netstat/pfkey.c index 2ab58e9..22a6421 100644 --- a/usr.bin/netstat/pfkey.c +++ b/usr.bin/netstat/pfkey.c @@ -83,8 +83,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include "netstat.h" #ifdef IPSEC diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index 2e9e919..db7a4d1 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -69,7 +69,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "netstat.h" diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c index fe29787..82a4c13 100644 --- a/usr.bin/netstat/sctp.c +++ b/usr.bin/netstat/sctp.c @@ -52,13 +52,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include #include #include #include -#include #include "netstat.h" #ifdef SCTP diff --git a/usr.bin/newgrp/newgrp.c b/usr.bin/newgrp/newgrp.c index 91b62a5..b5e0402 100644 --- a/usr.bin/newgrp/newgrp.c +++ b/usr.bin/newgrp/newgrp.c @@ -34,10 +34,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include -#include #include #include #include diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c index 11a1db9..eba42fc 100644 --- a/usr.bin/newkey/update.c +++ b/usr.bin/newkey/update.c @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include #endif /* YP */ -#include #include #include #include diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c index 4af133b..aa964b8 100644 --- a/usr.bin/nfsstat/nfsstat.c +++ b/usr.bin/nfsstat/nfsstat.c @@ -62,7 +62,6 @@ static const char rcsid[] = #include #include -#include #include #include #include @@ -71,7 +70,6 @@ static const char rcsid[] = #include #include #include -#include #include struct nlist nl[] = { diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c index 06f2244..aa3109c 100644 --- a/usr.bin/nohup/nohup.c +++ b/usr.bin/nohup/nohup.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include static void dofile(void); diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c index d35458c..dd12a56 100644 --- a/usr.bin/passwd/passwd.c +++ b/usr.bin/passwd/passwd.c @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c index 6e3e553..72c2736 100644 --- a/usr.bin/paste/paste.c +++ b/usr.bin/paste/paste.c @@ -52,12 +52,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include #include #include -#include #include #include diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c index 277459e..cf42d7c 100644 --- a/usr.bin/pr/egetopt.c +++ b/usr.bin/pr/egetopt.c @@ -46,11 +46,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include -#include "extern.h" - /* * egetopt: get option letter from argument vector (an extended * version of getopt). diff --git a/usr.bin/procstat/procstat_args.c b/usr.bin/procstat/procstat_args.c index e5a7acd..1c132ca 100644 --- a/usr.bin/procstat/procstat_args.c +++ b/usr.bin/procstat/procstat_args.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include "procstat.h" diff --git a/usr.bin/procstat/procstat_basic.c b/usr.bin/procstat/procstat_basic.c index 2775172..00109e7 100644 --- a/usr.bin/procstat/procstat_basic.c +++ b/usr.bin/procstat/procstat_basic.c @@ -30,7 +30,6 @@ #include #include -#include #include #include diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c index debb0e4..984dced 100644 --- a/usr.bin/procstat/procstat_files.c +++ b/usr.bin/procstat/procstat_files.c @@ -36,7 +36,6 @@ #include -#include #include #include #include diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c index 5c965a9..2d3a666 100644 --- a/usr.bin/procstat/procstat_vm.c +++ b/usr.bin/procstat/procstat_vm.c @@ -30,7 +30,6 @@ #include #include -#include #include #include #include diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c index 8b38897..66a7ad2 100644 --- a/usr.bin/rev/rev.c +++ b/usr.bin/rev/rev.c @@ -49,11 +49,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include -#include #include #include diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c index c279535..971de67 100644 --- a/usr.bin/rlogin/rlogin.c +++ b/usr.bin/rlogin/rlogin.c @@ -72,9 +72,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include -#include #include #include #include diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c index 713cba1..76c9b93 100644 --- a/usr.bin/rpcgen/rpc_clntout.c +++ b/usr.bin/rpcgen/rpc_clntout.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); * Copyright (C) 1987, Sun Microsytsems, Inc. */ #include -#include #include #include "rpc_parse.h" #include "rpc_scan.h" diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c index 7068363..ce92fe2 100644 --- a/usr.bin/rpcgen/rpc_hout.c +++ b/usr.bin/rpcgen/rpc_hout.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); * Copyright (C) 1987, Sun Microsystems, Inc. */ #include -#include #include "rpc_parse.h" #include "rpc_scan.h" #include "rpc_util.h" diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c index f96bdfc..736f857 100644 --- a/usr.bin/rpcgen/rpc_tblout.c +++ b/usr.bin/rpcgen/rpc_tblout.c @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); */ #include #include -#include #include "rpc_parse.h" #include "rpc_scan.h" #include "rpc_util.h" diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c index 9d1c85b..4080565 100644 --- a/usr.bin/rpcgen/rpc_util.c +++ b/usr.bin/rpcgen/rpc_util.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); * Copyright (C) 1989, Sun Microsystems, Inc. */ #include -#include #include #include #include diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c index 1e3356f..b8672e4 100644 --- a/usr.bin/ruptime/ruptime.c +++ b/usr.bin/ruptime/ruptime.c @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c index 042b72f..d104bde 100644 --- a/usr.bin/rwall/rwall.c +++ b/usr.bin/rwall/rwall.c @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c index 1a140b1..f99c12a 100644 --- a/usr.bin/sed/main.c +++ b/usr.bin/sed/main.c @@ -51,12 +51,10 @@ static const char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/3/94"; #include #include -#include #include #include #include #include -#include #include #include #include diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c index f3b5137..4a7f643 100644 --- a/usr.bin/sed/misc.c +++ b/usr.bin/sed/misc.c @@ -41,14 +41,8 @@ static const char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93"; #include #include -#include #include -#include #include -#include - -#include "defs.h" -#include "extern.h" /* * Return a string for a regular expression error passed. This is overkill, diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c index 5e67cc1..0a63a32 100644 --- a/usr.bin/showmount/showmount.c +++ b/usr.bin/showmount/showmount.c @@ -55,7 +55,6 @@ static const char rcsid[] = #include #include -#include #include #include #include diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c index 5dcb24a..88a19d9 100644 --- a/usr.bin/su/su.c +++ b/usr.bin/su/su.c @@ -88,7 +88,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include diff --git a/usr.bin/systat/fetch.c b/usr.bin/systat/fetch.c index 0edce34..124c3b9 100644 --- a/usr.bin/systat/fetch.c +++ b/usr.bin/systat/fetch.c @@ -42,7 +42,6 @@ static const char sccsid[] = "@(#)fetch.c 8.1 (Berkeley) 6/6/93"; #include #include -#include #include #include #include diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c index 2d5f8e4..acf6b3f 100644 --- a/usr.bin/systat/icmp.c +++ b/usr.bin/systat/icmp.c @@ -54,9 +54,7 @@ static char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93"; #include #include -#include #include -#include #include "systat.h" #include "extern.h" #include "mode.h" diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c index 90e1578..d3573af 100644 --- a/usr.bin/systat/iostat.c +++ b/usr.bin/systat/iostat.c @@ -73,7 +73,6 @@ static const char sccsid[] = "@(#)iostat.c 8.1 (Berkeley) 6/6/93"; #include #include #include -#include #include #include diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c index 0914328..44ed6ac 100644 --- a/usr.bin/systat/ip.c +++ b/usr.bin/systat/ip.c @@ -55,10 +55,6 @@ static const char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93"; #include #include -#include -#include -#include - #include "systat.h" #include "extern.h" #include "mode.h" diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index d092f10..90c6208 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -53,7 +53,6 @@ static const char copyright[] = #include #include #include -#include #include #include #include diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c index 37be1ef..9b0d4a8 100644 --- a/usr.bin/systat/mbufs.c +++ b/usr.bin/systat/mbufs.c @@ -47,7 +47,6 @@ static const char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93"; #include #include #include -#include #include "systat.h" #include "extern.h" diff --git a/usr.bin/systat/mode.c b/usr.bin/systat/mode.c index 5f64e3e..745a283 100644 --- a/usr.bin/systat/mode.c +++ b/usr.bin/systat/mode.c @@ -60,8 +60,6 @@ __FBSDID("$FreeBSD$"); -#include - #include "systat.h" #include "extern.h" #include "mode.h" diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c index 14fc495..eb469f3 100644 --- a/usr.bin/systat/netstat.c +++ b/usr.bin/systat/netstat.c @@ -74,7 +74,6 @@ static const char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93"; #include #include -#include #include #include diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c index 43df8eb..dca29b5 100644 --- a/usr.bin/systat/swap.c +++ b/usr.bin/systat/swap.c @@ -53,7 +53,6 @@ static const char sccsid[] = "@(#)swap.c 8.3 (Berkeley) 4/29/95"; #include #include #include -#include #include "systat.h" #include "extern.h" diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c index b7f7592..4a69a4f 100644 --- a/usr.bin/systat/tcp.c +++ b/usr.bin/systat/tcp.c @@ -57,9 +57,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include -#include #include "systat.h" #include "extern.h" diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c index 742e2f7..6585d93 100644 --- a/usr.bin/systat/vmstat.c +++ b/usr.bin/systat/vmstat.c @@ -60,7 +60,6 @@ static const char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94"; #include #include #include -#include #include #include #include diff --git a/usr.bin/tar/getdate.c b/usr.bin/tar/getdate.c index 8df1e26..effac4e 100644 --- a/usr.bin/tar/getdate.c +++ b/usr.bin/tar/getdate.c @@ -33,8 +33,6 @@ __FBSDID("$FreeBSD$"); #endif #include -#include -#include #include #include diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c index 123a2de..de592c5 100644 --- a/usr.bin/tee/tee.c +++ b/usr.bin/tee/tee.c @@ -52,7 +52,6 @@ static const char rcsid[] = #include #include #include -#include #include typedef struct _list { diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c index a97ffec..d586ba1 100644 --- a/usr.bin/time/time.c +++ b/usr.bin/time/time.c @@ -59,7 +59,6 @@ static const char rcsid[] = #include #include #include -#include #include static int getstathz(void); diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c index a478d5d..e3b8a37 100644 --- a/usr.bin/tput/tput.c +++ b/usr.bin/tput/tput.c @@ -45,8 +45,6 @@ static const char copyright[] = static const char sccsid[] = "@(#)tput.c 8.2 (Berkeley) 3/19/94"; #endif -#include - #include #include #include diff --git a/usr.bin/tr/cmap.c b/usr.bin/tr/cmap.c index 811040c..8c2ab97 100644 --- a/usr.bin/tr/cmap.c +++ b/usr.bin/tr/cmap.c @@ -33,10 +33,7 @@ __FBSDID("$FreeBSD$"); #include -#include -#include #include -#include #include "cmap.h" static struct cmapnode *cmap_splay(struct cmapnode *, wint_t); diff --git a/usr.bin/tr/cmap.h b/usr.bin/tr/cmap.h index 9a81e13..a7c1a30 100644 --- a/usr.bin/tr/cmap.h +++ b/usr.bin/tr/cmap.h @@ -29,7 +29,6 @@ #ifndef CMAP_H #define CMAP_H -#include #include #include diff --git a/usr.bin/tr/cset.c b/usr.bin/tr/cset.c index 1b42129..2535eed 100644 --- a/usr.bin/tr/cset.c +++ b/usr.bin/tr/cset.c @@ -33,10 +33,7 @@ __FBSDID("$FreeBSD$"); #include -#include #include -#include -#include #include "cset.h" static struct csnode * cset_delete(struct csnode *, wchar_t); diff --git a/usr.bin/tr/cset.h b/usr.bin/tr/cset.h index ab3eabd..4a8108a 100644 --- a/usr.bin/tr/cset.h +++ b/usr.bin/tr/cset.h @@ -30,7 +30,6 @@ #define CSET_H #include -#include #include struct csnode { diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c index 86ae173..1dee776 100644 --- a/usr.bin/tr/str.c +++ b/usr.bin/tr/str.c @@ -44,8 +44,6 @@ static const char sccsid[] = "@(#)str.c 8.2 (Berkeley) 4/28/95"; #include #include #include -#include -#include #include #include #include diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index 61195ff..6db16af 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -47,16 +47,12 @@ static const char sccsid[] = "@(#)tr.c 8.2 (Berkeley) 5/4/95"; #include -#include #include -#include #include #include #include #include #include -#include -#include #include "cmap.h" #include "cset.h" diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c index d0dd073..4036a63 100644 --- a/usr.bin/truss/main.c +++ b/usr.bin/truss/main.c @@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include #include #include diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c index 53a6fe1..4f79ea3 100644 --- a/usr.bin/truss/setup.c +++ b/usr.bin/truss/setup.c @@ -43,13 +43,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include #include #include -#include -#include #include #include diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c index a01a86c..e7c538e 100644 --- a/usr.bin/tsort/tsort.c +++ b/usr.bin/tsort/tsort.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c index 77559cf..725fc25 100644 --- a/usr.bin/ul/ul.c +++ b/usr.bin/ul/ul.c @@ -53,7 +53,6 @@ static const char rcsid[] = #include #include #include -#include #define IESC '\033' #define SO '\016' diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c index d59cd4e..5009ca1 100644 --- a/usr.bin/unexpand/unexpand.c +++ b/usr.bin/unexpand/unexpand.c @@ -54,10 +54,8 @@ static const char sccsid[] = "@(#)unexpand.c 8.1 (Berkeley) 6/6/93"; #include #include #include -#include #include #include -#include int all; int nstops; diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c index a5e2598..783909e 100644 --- a/usr.bin/usbhidaction/usbhidaction.c +++ b/usr.bin/usbhidaction/usbhidaction.c @@ -50,7 +50,6 @@ #include #include #include -#include #include static int verbose = 0; diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c index 6ad82c2..fcf6047 100644 --- a/usr.bin/vis/foldit.c +++ b/usr.bin/vis/foldit.c @@ -41,12 +41,8 @@ static const char sccsid[] = "@(#)foldit.c 8.1 (Berkeley) 6/6/93"; #include -#include "extern.h" - int -foldit(chunk, col, max) - char *chunk; - int col, max; +foldit(char *chunk, int col, int max) { char *cp; diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c index acf6f8c..b46fe17 100644 --- a/usr.bin/w/pr_time.c +++ b/usr.bin/w/pr_time.c @@ -43,7 +43,6 @@ static const char sccsid[] = "@(#)pr_time.c 8.2 (Berkeley) 4/4/94"; #include #include -#include #include #include "extern.h" diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index d35892e..23fce28 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -66,7 +66,6 @@ static const char sccsid[] = "@(#)w.c 8.4 (Berkeley) 4/16/94"; #include #include -#include #include #include #include @@ -82,11 +81,9 @@ static const char sccsid[] = "@(#)w.c 8.4 (Berkeley) 4/16/94"; #include #include #include -#include #define _ULOG_POSIX_NAMES #include #include -#include #include "extern.h" diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c index a977875..bb5c43e 100644 --- a/usr.bin/wall/ttymsg.c +++ b/usr.bin/wall/ttymsg.c @@ -48,7 +48,6 @@ static const char sccsid[] = "@(#)ttymsg.c 8.2 (Berkeley) 11/16/93"; #include #include #include -#include #include #include "ttymsg.h" diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c index 5db4f88..a279d14 100644 --- a/usr.bin/who/who.c +++ b/usr.bin/who/who.c @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #define _ULOG_POSIX_NAMES #include #include diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 49e47c6..35f6a60 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include @@ -86,16 +85,16 @@ int dobackup, docompare, dodir, dopreserve, dostrip, nommap, safecopy, verbose; mode_t mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; const char *suffix = BACKUP_SUFFIX; -void copy(int, const char *, int, const char *, off_t); -int compare(int, const char *, size_t, int, const char *, size_t); -int create_newfile(const char *, int, struct stat *); -int create_tempfile(const char *, char *, size_t); -void install(const char *, const char *, u_long, u_int); -void install_dir(char *); -u_long numeric_id(const char *, const char *); -void strip(const char *); -int trymmap(int); -void usage(void); +static void copy(int, const char *, int, const char *, off_t); +static int compare(int, const char *, size_t, int, const char *, size_t); +static int create_newfile(const char *, int, struct stat *); +static int create_tempfile(const char *, char *, size_t); +static void install(const char *, const char *, u_long, u_int); +static void install_dir(char *); +static u_long numeric_id(const char *, const char *); +static void strip(const char *); +static int trymmap(int); +static void usage(void); int main(int argc, char *argv[]) diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c index 3484bc9..3da854e 100644 --- a/usr.bin/ypcat/ypcat.c +++ b/usr.bin/ypcat/ypcat.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c index a9c32ea..707a9e9 100644 --- a/usr.bin/ypmatch/ypmatch.c +++ b/usr.bin/ypmatch/ypmatch.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c index 4e719df..cb43f64 100644 --- a/usr.bin/ypwhich/ypwhich.c +++ b/usr.bin/ypwhich/ypwhich.c @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include -- cgit v1.1