Module Name: src
Committed By: rillig
Date: Sat Oct 3 21:52:51 UTC 2020
Modified Files:
src/usr.bin/make: arch.c compat.c dir.c enum.c main.c make_malloc.c
parse.c suff.c targ.c trace.c util.c
Log Message:
make(1): clean up #include sections
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/usr.bin/make/arch.c
cvs rdiff -u -r1.161 -r1.162 src/usr.bin/make/compat.c
cvs rdiff -u -r1.155 -r1.156 src/usr.bin/make/dir.c
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/enum.c
cvs rdiff -u -r1.363 -r1.364 src/usr.bin/make/main.c
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/make_malloc.c
cvs rdiff -u -r1.347 -r1.348 src/usr.bin/make/parse.c
cvs rdiff -u -r1.173 -r1.174 src/usr.bin/make/suff.c
cvs rdiff -u -r1.108 -r1.109 src/usr.bin/make/targ.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/trace.c
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/make/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/arch.c
diff -u src/usr.bin/make/arch.c:1.129 src/usr.bin/make/arch.c:1.130
--- src/usr.bin/make/arch.c:1.129 Sat Oct 3 21:19:54 2020
+++ src/usr.bin/make/arch.c Sat Oct 3 21:52:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.129 2020/10/03 21:19:54 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.130 2020/10/03 21:52:50 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -123,18 +123,14 @@
#include <sys/param.h>
#include <ar.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <utime.h>
#include "make.h"
-#include "hash.h"
#include "dir.h"
#include "config.h"
/* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: arch.c,v 1.129 2020/10/03 21:19:54 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.130 2020/10/03 21:52:50 rillig Exp $");
#ifdef TARGET_MACHINE
#undef MAKE_MACHINE
Index: src/usr.bin/make/compat.c
diff -u src/usr.bin/make/compat.c:1.161 src/usr.bin/make/compat.c:1.162
--- src/usr.bin/make/compat.c:1.161 Thu Oct 1 22:42:00 2020
+++ src/usr.bin/make/compat.c Sat Oct 3 21:52:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.161 2020/10/01 22:42:00 rillig Exp $ */
+/* $NetBSD: compat.c,v 1.162 2020/10/03 21:52:50 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -86,20 +86,17 @@
#include <sys/stat.h>
#include <sys/wait.h>
-#include <ctype.h>
#include <errno.h>
#include <signal.h>
-#include <stdio.h>
#include "make.h"
-#include "hash.h"
#include "dir.h"
#include "job.h"
#include "metachar.h"
#include "pathnames.h"
/* "@(#)compat.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.161 2020/10/01 22:42:00 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.162 2020/10/03 21:52:50 rillig Exp $");
static GNode *curTarg = NULL;
static pid_t compatChild;
Index: src/usr.bin/make/dir.c
diff -u src/usr.bin/make/dir.c:1.155 src/usr.bin/make/dir.c:1.156
--- src/usr.bin/make/dir.c:1.155 Fri Oct 2 22:20:25 2020
+++ src/usr.bin/make/dir.c Sat Oct 3 21:52:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.155 2020/10/02 22:20:25 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.156 2020/10/03 21:52:50 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -129,14 +129,13 @@
#include <dirent.h>
#include <errno.h>
-#include <stdio.h>
#include "make.h"
#include "dir.h"
#include "job.h"
/* "@(#)dir.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: dir.c,v 1.155 2020/10/02 22:20:25 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.156 2020/10/03 21:52:50 rillig Exp $");
#define DIR_DEBUG0(text) DEBUG0(DIR, text)
#define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1)
Index: src/usr.bin/make/enum.c
diff -u src/usr.bin/make/enum.c:1.9 src/usr.bin/make/enum.c:1.10
--- src/usr.bin/make/enum.c:1.9 Sat Oct 3 06:36:01 2020
+++ src/usr.bin/make/enum.c Sat Oct 3 21:52:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: enum.c,v 1.9 2020/10/03 06:36:01 rillig Exp $ */
+/* $NetBSD: enum.c,v 1.10 2020/10/03 21:52:50 rillig Exp $ */
/*
Copyright (c) 2020 Roland Illig <[email protected]>
@@ -27,13 +27,9 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
#include "make.h"
-MAKE_RCSID("$NetBSD: enum.c,v 1.9 2020/10/03 06:36:01 rillig Exp $");
+MAKE_RCSID("$NetBSD: enum.c,v 1.10 2020/10/03 21:52:50 rillig Exp $");
/* Convert a bitset into a string representation, showing the names of the
* individual bits.
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.363 src/usr.bin/make/main.c:1.364
--- src/usr.bin/make/main.c:1.363 Sat Oct 3 13:22:39 2020
+++ src/usr.bin/make/main.c Sat Oct 3 21:52:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.363 2020/10/03 13:22:39 rillig Exp $ */
+/* $NetBSD: main.c,v 1.364 2020/10/03 21:52:50 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -106,16 +106,12 @@
#include <sys/utsname.h>
#include <sys/wait.h>
-#include <ctype.h>
#include <errno.h>
#include <signal.h>
#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <time.h>
#include "make.h"
-#include "hash.h"
#include "dir.h"
#include "job.h"
#include "pathnames.h"
@@ -126,7 +122,7 @@
#endif
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.363 2020/10/03 13:22:39 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.364 2020/10/03 21:52:50 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
Index: src/usr.bin/make/make_malloc.c
diff -u src/usr.bin/make/make_malloc.c:1.20 src/usr.bin/make/make_malloc.c:1.21
--- src/usr.bin/make/make_malloc.c:1.20 Thu Oct 1 22:42:00 2020
+++ src/usr.bin/make/make_malloc.c Sat Oct 3 21:52:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make_malloc.c,v 1.20 2020/10/01 22:42:00 rillig Exp $ */
+/* $NetBSD: make_malloc.c,v 1.21 2020/10/03 21:52:50 rillig Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -26,14 +26,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <errno.h>
#include "make.h"
-MAKE_RCSID("$NetBSD: make_malloc.c,v 1.20 2020/10/01 22:42:00 rillig Exp $");
+MAKE_RCSID("$NetBSD: make_malloc.c,v 1.21 2020/10/03 21:52:50 rillig Exp $");
#ifndef USE_EMALLOC
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.347 src/usr.bin/make/parse.c:1.348
--- src/usr.bin/make/parse.c:1.347 Sat Oct 3 21:43:41 2020
+++ src/usr.bin/make/parse.c Sat Oct 3 21:52:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.347 2020/10/03 21:43:41 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.348 2020/10/03 21:52:50 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -116,7 +116,6 @@
#include <sys/stat.h>
#include <errno.h>
#include <stdarg.h>
-#include <stdio.h>
#include <stdint.h>
#ifndef MAP_FILE
@@ -132,7 +131,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.347 2020/10/03 21:43:41 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.348 2020/10/03 21:52:50 rillig Exp $");
/* types and constants */
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.173 src/usr.bin/make/suff.c:1.174
--- src/usr.bin/make/suff.c:1.173 Mon Sep 28 23:13:57 2020
+++ src/usr.bin/make/suff.c Sat Oct 3 21:52:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.173 2020/09/28 23:13:57 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.174 2020/10/03 21:52:50 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -125,11 +125,11 @@
* find the node.
*/
-#include "make.h"
-#include "dir.h"
+#include "make.h"
+#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.173 2020/09/28 23:13:57 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.174 2020/10/03 21:52:50 rillig Exp $");
#define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
#define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
Index: src/usr.bin/make/targ.c
diff -u src/usr.bin/make/targ.c:1.108 src/usr.bin/make/targ.c:1.109
--- src/usr.bin/make/targ.c:1.108 Mon Sep 28 23:31:18 2020
+++ src/usr.bin/make/targ.c Sat Oct 3 21:52:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: targ.c,v 1.108 2020/09/28 23:31:18 rillig Exp $ */
+/* $NetBSD: targ.c,v 1.109 2020/10/03 21:52:50 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -115,14 +115,13 @@
* something for suffixes, too, but...
*/
-#include <stdio.h>
-#include <time.h>
+#include <time.h>
-#include "make.h"
-#include "dir.h"
+#include "make.h"
+#include "dir.h"
/* "@(#)targ.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: targ.c,v 1.108 2020/09/28 23:31:18 rillig Exp $");
+MAKE_RCSID("$NetBSD: targ.c,v 1.109 2020/10/03 21:52:50 rillig Exp $");
static GNodeList *allTargets; /* the list of all targets found so far */
#ifdef CLEANUP
Index: src/usr.bin/make/trace.c
diff -u src/usr.bin/make/trace.c:1.16 src/usr.bin/make/trace.c:1.17
--- src/usr.bin/make/trace.c:1.16 Sun Sep 13 15:15:51 2020
+++ src/usr.bin/make/trace.c Sat Oct 3 21:52:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trace.c,v 1.16 2020/09/13 15:15:51 rillig Exp $ */
+/* $NetBSD: trace.c,v 1.17 2020/10/03 21:52:50 rillig Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -44,14 +44,11 @@
#include <sys/time.h>
-#include <stdio.h>
-#include <unistd.h>
-
#include "make.h"
#include "job.h"
#include "trace.h"
-MAKE_RCSID("$NetBSD: trace.c,v 1.16 2020/09/13 15:15:51 rillig Exp $");
+MAKE_RCSID("$NetBSD: trace.c,v 1.17 2020/10/03 21:52:50 rillig Exp $");
static FILE *trfile;
static pid_t trpid;
Index: src/usr.bin/make/util.c
diff -u src/usr.bin/make/util.c:1.60 src/usr.bin/make/util.c:1.61
--- src/usr.bin/make/util.c:1.60 Sun Sep 13 15:15:51 2020
+++ src/usr.bin/make/util.c Sat Oct 3 21:52:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.60 2020/09/13 15:15:51 rillig Exp $ */
+/* $NetBSD: util.c,v 1.61 2020/10/03 21:52:50 rillig Exp $ */
/*
* Missing stuff from OS's
@@ -10,13 +10,12 @@
#include <sys/param.h>
#include <errno.h>
-#include <stdio.h>
#include <time.h>
#include <signal.h>
#include "make.h"
-MAKE_RCSID("$NetBSD: util.c,v 1.60 2020/09/13 15:15:51 rillig Exp $");
+MAKE_RCSID("$NetBSD: util.c,v 1.61 2020/10/03 21:52:50 rillig Exp $");
#if !defined(MAKE_NATIVE) && !defined(HAVE_STRERROR)
extern int errno, sys_nerr;
