Remove unneeded header includes from usr.bin/ except contributed code.

Tested with: make universe
schadde · Dec 11, 2009 · b963db4 · b963db4
1 parent f8bfec1
commit b963db4
Show file tree

Hide file tree

Showing 121 changed files with 19 additions and 193 deletions.
diff --git a/usr.bin/ar/util.c b/usr.bin/ar/util.c
@@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/queue.h>
 #include <sys/types.h>
-#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/usr.bin/c89/c89.c b/usr.bin/c89/c89.c
@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <unistd.h>
 

diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
 #include <time.h>
 #include <unistd.h>
 
-#include "pathnames.h"
 #include "calendar.h"
 
 struct passwd	*pw;

diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <time.h>
 
-#include "pathnames.h"
 #include "calendar.h"
 
 struct tm		*tp;

diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
@@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 
 #include "calendar.h"
 

diff --git a/usr.bin/calendar/paskha.c b/usr.bin/calendar/paskha.c
@@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 
 #include "calendar.h"
 

diff --git 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 <bsd.prog.mk>
diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
-#include <stdint.h>
 #include <unistd.h>
 
 #include "extern.h"

diff --git a/usr.bin/cksum/crc32.c b/usr.bin/cksum/crc32.c
@@ -17,7 +17,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 
 #include <stdio.h>
-#include <stdint.h>
 #include <unistd.h>
 
 #include "extern.h"

diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 
 #include <unistd.h>
-#include <stdint.h>
 
 #include "extern.h"
 

diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 
 #include <unistd.h>
-#include <stdint.h>
 
 #include "extern.h"
 

diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
@@ -45,12 +45,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 
 #include <err.h>
-#include <errno.h>
 #include <limits.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "extern.h"

diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 
 #include "extern.h"
 

diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 #include <wchar.h>
 

diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
@@ -48,12 +48,9 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <err.h>
-#include <errno.h>
-#include <limits.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 #include <wchar.h>
 

diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
@@ -67,13 +67,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/stat.h>
 
-#include <ctype.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include "zopen.h"
 
 #define	BITS		16		/* Default bits. */

diff --git a/usr.bin/cpuset/cpuset.c b/usr.bin/cpuset/cpuset.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <stdint.h>
 #include <unistd.h>
-#include <string.h>
 
 int cflag;
 int gflag;

diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <unistd.h>
 #include <wchar.h>
-#include <wctype.h>
 
 /*
  * expand - expand tabs to equivalent spaces

diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/time.h>
 
-#include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <signal.h>

diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
@@ -10,7 +10,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 #include <fts.h>
 #include <regex.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "find.h"

diff --git a/usr.bin/find/getdate.y b/usr.bin/find/getdate.y
@@ -15,7 +15,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <stdio.h>
 #include <ctype.h>
 
 /* 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
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 
 #include <err.h>
-#include <errno.h>
 #include <fts.h>
 #include <grp.h>
 #include <inttypes.h>

diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 
 #include <err.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <fts.h>
 #include <locale.h>

diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 
 #include <err.h>
-#include <errno.h>
 #include <fts.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <fts.h>
 #include <regex.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git 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
@@ -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
@@ -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
@@ -180,7 +180,6 @@ __FBSDID("$FreeBSD$");
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sysexits.h>
 #include <unistd.h>
 #include <wchar.h>

diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 #include <wchar.h>
 #include <wctype.h>

diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "extern.h"

diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c
@@ -7,7 +7,6 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 int

diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include "hexdump.h"
 
 enum _vflag vflag = FIRST;

diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <locale.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include "hexdump.h"
 

diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
@@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 /* Defaults */

diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c
@@ -34,8 +34,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 #include <sys/user.h>
 #include <sys/sysctl.h>
-#include <fcntl.h>
-#include <dirent.h>
 #include <jail.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
@@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 #include <sys/ktrace.h>
 
-#include <stdio.h>
-
 #include "ktrace.h"
 
 void timevaladd(struct timeval *, struct timeval *);

diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
@@ -51,9 +51,6 @@ __FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <grp.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git 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 <paths.h>
-
 #define	_PATH_ACCT	"/var/account/acct"
diff --git a/usr.bin/lastcomm/readrec.c b/usr.bin/lastcomm/readrec.c
@@ -33,13 +33,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/acct.h>
 
-#include <ctype.h>
-#include <err.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 int	 readrec_forward(FILE *f, struct acctv2 *av2);

diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdarg.h>
 #include <stdint.h>
 #include <ctype.h>
 #include <errno.h>

diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/signal.h>
 #include <sys/consio.h>
 #include <err.h>
-#include <ctype.h>
 #include <errno.h>
 #include <pwd.h>
 #include <stdio.h>

diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
@@ -64,8 +64,8 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <errno.h>
 #include <grp.h>
-#include <libutil.h>
 #include <login_cap.h>
+#include <paths.h>
 #include <pwd.h>
 #include <setjmp.h>
 #include <signal.h>

diff --git a/usr.bin/login/login_fbtab.c b/usr.bin/login/login_fbtab.c
@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
 #include <syslog.h>
 #include <unistd.h>
 
-#include "login.h"
 #include "pathnames.h"
 
 static void	login_protect(const char *, char *, int, uid_t, gid_t);
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ __FBSDID("$FreeBSD$"); @@
      */
     #include <stdio.h>
-    #include <stdlib.h>
     #include <unistd.h>
     int
@@ Expand Down @@