Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make make(1): clean up #include sections
details: https://anonhg.NetBSD.org/src/rev/a8bb2045124e
branches: trunk
changeset: 944572:a8bb2045124e
user: rillig <rillig%NetBSD.org@localhost>
date: Sat Oct 03 21:52:50 2020 +0000
description:
make(1): clean up #include sections
diffstat:
usr.bin/make/arch.c | 8 ++------
usr.bin/make/compat.c | 7 ++-----
usr.bin/make/dir.c | 5 ++---
usr.bin/make/enum.c | 8 ++------
usr.bin/make/main.c | 8 ++------
usr.bin/make/make_malloc.c | 7 ++-----
usr.bin/make/parse.c | 5 ++---
usr.bin/make/suff.c | 8 ++++----
usr.bin/make/targ.c | 11 +++++------
usr.bin/make/trace.c | 7 ++-----
usr.bin/make/util.c | 5 ++---
11 files changed, 27 insertions(+), 52 deletions(-)
diffs (296 lines):
diff -r 97649bc617ab -r a8bb2045124e usr.bin/make/arch.c
--- a/usr.bin/make/arch.c Sat Oct 03 21:43:41 2020 +0000
+++ b/usr.bin/make/arch.c Sat Oct 03 21:52:50 2020 +0000
@@ -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
diff -r 97649bc617ab -r a8bb2045124e usr.bin/make/compat.c
--- a/usr.bin/make/compat.c Sat Oct 03 21:43:41 2020 +0000
+++ b/usr.bin/make/compat.c Sat Oct 03 21:52:50 2020 +0000
@@ -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;
diff -r 97649bc617ab -r a8bb2045124e usr.bin/make/dir.c
--- a/usr.bin/make/dir.c Sat Oct 03 21:43:41 2020 +0000
+++ b/usr.bin/make/dir.c Sat Oct 03 21:52:50 2020 +0000
@@ -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)
diff -r 97649bc617ab -r a8bb2045124e usr.bin/make/enum.c
--- a/usr.bin/make/enum.c Sat Oct 03 21:43:41 2020 +0000
+++ b/usr.bin/make/enum.c Sat Oct 03 21:52:50 2020 +0000
@@ -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 <rillig%NetBSD.org@localhost>
@@ -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.
diff -r 97649bc617ab -r a8bb2045124e usr.bin/make/main.c
--- a/usr.bin/make/main.c Sat Oct 03 21:43:41 2020 +0000
+++ b/usr.bin/make/main.c Sat Oct 03 21:52:50 2020 +0000
@@ -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. "
diff -r 97649bc617ab -r a8bb2045124e usr.bin/make/make_malloc.c
--- a/usr.bin/make/make_malloc.c Sat Oct 03 21:43:41 2020 +0000
+++ b/usr.bin/make/make_malloc.c Sat Oct 03 21:52:50 2020 +0000
@@ -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
diff -r 97649bc617ab -r a8bb2045124e usr.bin/make/parse.c
--- a/usr.bin/make/parse.c Sat Oct 03 21:43:41 2020 +0000
+++ b/usr.bin/make/parse.c Sat Oct 03 21:52:50 2020 +0000
@@ -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 */
diff -r 97649bc617ab -r a8bb2045124e usr.bin/make/suff.c
--- a/usr.bin/make/suff.c Sat Oct 03 21:43:41 2020 +0000
+++ b/usr.bin/make/suff.c Sat Oct 03 21:52:50 2020 +0000
@@ -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)
diff -r 97649bc617ab -r a8bb2045124e usr.bin/make/targ.c
--- a/usr.bin/make/targ.c Sat Oct 03 21:43:41 2020 +0000
+++ b/usr.bin/make/targ.c Sat Oct 03 21:52:50 2020 +0000
@@ -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
diff -r 97649bc617ab -r a8bb2045124e usr.bin/make/trace.c
--- a/usr.bin/make/trace.c Sat Oct 03 21:43:41 2020 +0000
+++ b/usr.bin/make/trace.c Sat Oct 03 21:52:50 2020 +0000
@@ -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;
diff -r 97649bc617ab -r a8bb2045124e usr.bin/make/util.c
--- a/usr.bin/make/util.c Sat Oct 03 21:43:41 2020 +0000
+++ b/usr.bin/make/util.c Sat Oct 03 21:52:50 2020 +0000
@@ -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;
Home |
Main Index |
Thread Index |
Old Index