Module Name: src
Committed By: rillig
Date: Sat Oct 31 18:41:07 UTC 2020
Modified Files:
src/usr.bin/make: arch.c for.c make.c var.c
Log Message:
make(1): format #include directives consistently
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/usr.bin/make/arch.c
cvs rdiff -u -r1.111 -r1.112 src/usr.bin/make/for.c
cvs rdiff -u -r1.184 -r1.185 src/usr.bin/make/make.c
cvs rdiff -u -r1.629 -r1.630 src/usr.bin/make/var.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.150 src/usr.bin/make/arch.c:1.151
--- src/usr.bin/make/arch.c:1.150 Sat Oct 31 11:54:33 2020
+++ src/usr.bin/make/arch.c Sat Oct 31 18:41:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.150 2020/10/31 11:54:33 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.151 2020/10/31 18:41:07 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -117,20 +117,20 @@
* Arch_End Clean up this module.
*/
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/param.h>
-
-#include <ar.h>
-#include <utime.h>
-
-#include "make.h"
-#include "dir.h"
-#include "config.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/param.h>
+
+#include <ar.h>
+#include <utime.h>
+
+#include "make.h"
+#include "dir.h"
+#include "config.h"
/* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: arch.c,v 1.150 2020/10/31 11:54:33 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.151 2020/10/31 18:41:07 rillig Exp $");
#ifdef TARGET_MACHINE
#undef MAKE_MACHINE
Index: src/usr.bin/make/for.c
diff -u src/usr.bin/make/for.c:1.111 src/usr.bin/make/for.c:1.112
--- src/usr.bin/make/for.c:1.111 Mon Oct 26 07:37:52 2020
+++ src/usr.bin/make/for.c Sat Oct 31 18:41:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: for.c,v 1.111 2020/10/26 07:37:52 rillig Exp $ */
+/* $NetBSD: for.c,v 1.112 2020/10/31 18:41:07 rillig Exp $ */
/*
* Copyright (c) 1992, The Regents of the University of California.
@@ -57,10 +57,10 @@
* For_Run Run accumulated loop
*/
-#include "make.h"
+#include "make.h"
/* "@(#)for.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: for.c,v 1.111 2020/10/26 07:37:52 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.112 2020/10/31 18:41:07 rillig Exp $");
/* The .for loop substitutes the items as ${:U<value>...}, which means
* that characters that break this syntax must be backslash-escaped. */
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.184 src/usr.bin/make/make.c:1.185
--- src/usr.bin/make/make.c:1.184 Sat Oct 31 11:54:33 2020
+++ src/usr.bin/make/make.c Sat Oct 31 18:41:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.184 2020/10/31 11:54:33 rillig Exp $ */
+/* $NetBSD: make.c,v 1.185 2020/10/31 18:41:07 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -102,12 +102,12 @@
* Make_ExpandUse Expand .USE nodes
*/
-#include "make.h"
-#include "dir.h"
-#include "job.h"
+#include "make.h"
+#include "dir.h"
+#include "job.h"
/* "@(#)make.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: make.c,v 1.184 2020/10/31 11:54:33 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.185 2020/10/31 18:41:07 rillig Exp $");
/* Sequence # to detect recursion. */
static unsigned int checked = 1;
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.629 src/usr.bin/make/var.c:1.630
--- src/usr.bin/make/var.c:1.629 Sat Oct 31 18:17:08 2020
+++ src/usr.bin/make/var.c Sat Oct 31 18:41:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.629 2020/10/31 18:17:08 rillig Exp $ */
+/* $NetBSD: var.c,v 1.630 2020/10/31 18:41:07 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -114,22 +114,22 @@
* XXX: There's a lot of duplication in these functions.
*/
-#include <sys/stat.h>
+#include <sys/stat.h>
#ifndef NO_REGEX
-#include <sys/types.h>
-#include <regex.h>
+#include <sys/types.h>
+#include <regex.h>
#endif
-#include <inttypes.h>
-#include <limits.h>
-#include <time.h>
-
-#include "make.h"
-#include "dir.h"
-#include "job.h"
-#include "metachar.h"
+#include <inttypes.h>
+#include <limits.h>
+#include <time.h>
+
+#include "make.h"
+#include "dir.h"
+#include "job.h"
+#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.629 2020/10/31 18:17:08 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.630 2020/10/31 18:41:07 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
