Module Name: src
Committed By: rillig
Date: Tue Jan 19 20:51:46 UTC 2021
Modified Files:
src/usr.bin/make: compat.c cond.c for.c job.c main.c make.h
make_malloc.c make_malloc.h metachar.c metachar.h nonints.h str.c
trace.c trace.h
src/usr.bin/make/filemon: filemon.h filemon_dev.c filemon_ktrace.c
Log Message:
make(1): remove do-not-format markers from comments
These markers had been used inconsistently. Furthermore the source code
had not been formatted automatically before 2020 at all, otherwise there
wouldn't have been any trailing whitespace left.
To generate a diff of this commit:
cvs rdiff -u -r1.219 -r1.220 src/usr.bin/make/compat.c
cvs rdiff -u -r1.241 -r1.242 src/usr.bin/make/cond.c
cvs rdiff -u -r1.134 -r1.135 src/usr.bin/make/for.c
cvs rdiff -u -r1.397 -r1.398 src/usr.bin/make/job.c
cvs rdiff -u -r1.513 -r1.514 src/usr.bin/make/main.c
cvs rdiff -u -r1.243 -r1.244 src/usr.bin/make/make.h
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/make/make_malloc.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/make_malloc.h
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/metachar.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/metachar.h
cvs rdiff -u -r1.186 -r1.187 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.78 -r1.79 src/usr.bin/make/str.c
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/make/trace.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/trace.h
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/filemon/filemon.h
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/filemon/filemon_dev.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/filemon/filemon_ktrace.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/compat.c
diff -u src/usr.bin/make/compat.c:1.219 src/usr.bin/make/compat.c:1.220
--- src/usr.bin/make/compat.c:1.219 Sun Jan 10 21:20:46 2021
+++ src/usr.bin/make/compat.c Tue Jan 19 20:51:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.219 2021/01/10 21:20:46 rillig Exp $ */
+/* $NetBSD: compat.c,v 1.220 2021/01/19 20:51:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -69,7 +69,7 @@
* SUCH DAMAGE.
*/
-/*-
+/*
* compat.c --
* The routines in this file implement the full-compatibility
* mode of PMake. Most of the special functionality of PMake
@@ -96,7 +96,7 @@
#include "pathnames.h"
/* "@(#)compat.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.219 2021/01/10 21:20:46 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.220 2021/01/19 20:51:46 rillig Exp $");
static GNode *curTarg = NULL;
static pid_t compatChild;
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.241 src/usr.bin/make/cond.c:1.242
--- src/usr.bin/make/cond.c:1.241 Tue Jan 19 19:29:35 2021
+++ src/usr.bin/make/cond.c Tue Jan 19 20:51:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.241 2021/01/19 19:29:35 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.242 2021/01/19 20:51:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,7 +95,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.241 2021/01/19 19:29:35 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.242 2021/01/19 20:51:46 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -387,7 +387,7 @@ is_separator(char ch)
return ch == '\0' || ch_isspace(ch) || strchr("!=><)", ch) != NULL;
}
-/*-
+/*
* Parse a string from a variable reference or an optionally quoted
* string. This is called for the lhs and rhs of string comparisons.
*
Index: src/usr.bin/make/for.c
diff -u src/usr.bin/make/for.c:1.134 src/usr.bin/make/for.c:1.135
--- src/usr.bin/make/for.c:1.134 Sun Jan 10 21:20:46 2021
+++ src/usr.bin/make/for.c Tue Jan 19 20:51:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: for.c,v 1.134 2021/01/10 21:20:46 rillig Exp $ */
+/* $NetBSD: for.c,v 1.135 2021/01/19 20:51:46 rillig Exp $ */
/*
* Copyright (c) 1992, The Regents of the University of California.
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
-/*-
+/*
* Handling of .for/.endfor loops in a makefile.
*
* For loops have the form:
@@ -58,7 +58,7 @@
#include "make.h"
/* "@(#)for.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: for.c,v 1.134 2021/01/10 21:20:46 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.135 2021/01/19 20:51:46 rillig Exp $");
static int forLevel = 0; /* Nesting level */
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.397 src/usr.bin/make/job.c:1.398
--- src/usr.bin/make/job.c:1.397 Sun Jan 10 23:59:53 2021
+++ src/usr.bin/make/job.c Tue Jan 19 20:51:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.397 2021/01/10 23:59:53 rillig Exp $ */
+/* $NetBSD: job.c,v 1.398 2021/01/19 20:51:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -69,7 +69,7 @@
* SUCH DAMAGE.
*/
-/*-
+/*
* job.c --
* handle the creation etc. of our child processes.
*
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.397 2021/01/10 23:59:53 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.398 2021/01/19 20:51:46 rillig Exp $");
/*
* A shell defines how the commands are run. All commands for a target are
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.513 src/usr.bin/make/main.c:1.514
--- src/usr.bin/make/main.c:1.513 Sat Jan 16 20:49:31 2021
+++ src/usr.bin/make/main.c Tue Jan 19 20:51:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.513 2021/01/16 20:49:31 rillig Exp $ */
+/* $NetBSD: main.c,v 1.514 2021/01/19 20:51:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -110,7 +110,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.513 2021/01/16 20:49:31 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.514 2021/01/19 20:51:46 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -1744,7 +1744,7 @@ found:
return 0;
}
-/*-
+/*
* Cmd_Exec --
* Execute the command in cmd, and return the output of that command
* in a string. In the output, newlines are replaced with spaces.
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.243 src/usr.bin/make/make.h:1.244
--- src/usr.bin/make/make.h:1.243 Sat Jan 16 20:49:31 2021
+++ src/usr.bin/make/make.h Tue Jan 19 20:51:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.243 2021/01/16 20:49:31 rillig Exp $ */
+/* $NetBSD: make.h,v 1.244 2021/01/19 20:51:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -72,7 +72,7 @@
* from: @(#)make.h 8.3 (Berkeley) 6/13/95
*/
-/*-
+/*
* make.h --
* The global definitions for pmake
*/
Index: src/usr.bin/make/make_malloc.c
diff -u src/usr.bin/make/make_malloc.c:1.24 src/usr.bin/make/make_malloc.c:1.25
--- src/usr.bin/make/make_malloc.c:1.24 Mon Dec 7 22:37:18 2020
+++ src/usr.bin/make/make_malloc.c Tue Jan 19 20:51:46 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: make_malloc.c,v 1.24 2020/12/07 22:37:18 rillig Exp $ */
+/* $NetBSD: make_malloc.c,v 1.25 2021/01/19 20:51:46 rillig Exp $ */
-/*-
+/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -30,7 +30,7 @@
#include "make.h"
-MAKE_RCSID("$NetBSD: make_malloc.c,v 1.24 2020/12/07 22:37:18 rillig Exp $");
+MAKE_RCSID("$NetBSD: make_malloc.c,v 1.25 2021/01/19 20:51:46 rillig Exp $");
#ifndef USE_EMALLOC
Index: src/usr.bin/make/make_malloc.h
diff -u src/usr.bin/make/make_malloc.h:1.15 src/usr.bin/make/make_malloc.h:1.16
--- src/usr.bin/make/make_malloc.h:1.15 Wed Dec 30 10:03:16 2020
+++ src/usr.bin/make/make_malloc.h Tue Jan 19 20:51:46 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: make_malloc.h,v 1.15 2020/12/30 10:03:16 rillig Exp $ */
+/* $NetBSD: make_malloc.h,v 1.16 2021/01/19 20:51:46 rillig Exp $ */
-/*-
+/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
* All rights reserved.
*
Index: src/usr.bin/make/metachar.c
diff -u src/usr.bin/make/metachar.c:1.8 src/usr.bin/make/metachar.c:1.9
--- src/usr.bin/make/metachar.c:1.8 Fri Oct 30 19:14:20 2020
+++ src/usr.bin/make/metachar.c Tue Jan 19 20:51:46 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: metachar.c,v 1.8 2020/10/30 19:14:20 rillig Exp $ */
+/* $NetBSD: metachar.c,v 1.9 2021/01/19 20:51:46 rillig Exp $ */
-/*-
+/*
* Copyright (c) 2015 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -39,7 +39,7 @@
#include "metachar.h"
-MAKE_RCSID("$NetBSD: metachar.c,v 1.8 2020/10/30 19:14:20 rillig Exp $");
+MAKE_RCSID("$NetBSD: metachar.c,v 1.9 2021/01/19 20:51:46 rillig Exp $");
/*
* The following array is used to make a fast determination of which
@@ -82,4 +82,3 @@ unsigned char _metachar[128] = {
/* x y z { | } ~ del */
0, 0, 0, 1, 1, 1, 1, 0,
};
-
Index: src/usr.bin/make/metachar.h
diff -u src/usr.bin/make/metachar.h:1.14 src/usr.bin/make/metachar.h:1.15
--- src/usr.bin/make/metachar.h:1.14 Sat Jan 16 20:49:31 2021
+++ src/usr.bin/make/metachar.h Tue Jan 19 20:51:46 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: metachar.h,v 1.14 2021/01/16 20:49:31 rillig Exp $ */
+/* $NetBSD: metachar.h,v 1.15 2021/01/19 20:51:46 rillig Exp $ */
-/*-
+/*
* Copyright (c) 2015 The NetBSD Foundation, Inc.
* All rights reserved.
*
Index: src/usr.bin/make/nonints.h
diff -u src/usr.bin/make/nonints.h:1.186 src/usr.bin/make/nonints.h:1.187
--- src/usr.bin/make/nonints.h:1.186 Mon Dec 28 00:46:24 2020
+++ src/usr.bin/make/nonints.h Tue Jan 19 20:51:46 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: nonints.h,v 1.186 2020/12/28 00:46:24 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.187 2021/01/19 20:51:46 rillig Exp $ */
-/*-
+/*
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -34,7 +34,7 @@
* from: @(#)nonints.h 8.3 (Berkeley) 3/19/94
*/
-/*-
+/*
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
*
Index: src/usr.bin/make/str.c
diff -u src/usr.bin/make/str.c:1.78 src/usr.bin/make/str.c:1.79
--- src/usr.bin/make/str.c:1.78 Sun Jan 10 23:59:53 2021
+++ src/usr.bin/make/str.c Tue Jan 19 20:51:46 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: str.c,v 1.78 2021/01/10 23:59:53 rillig Exp $ */
+/* $NetBSD: str.c,v 1.79 2021/01/19 20:51:46 rillig Exp $ */
-/*-
+/*
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*/
-/*-
+/*
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
*
@@ -71,7 +71,7 @@
#include "make.h"
/* "@(#)str.c 5.8 (Berkeley) 6/1/90" */
-MAKE_RCSID("$NetBSD: str.c,v 1.78 2021/01/10 23:59:53 rillig Exp $");
+MAKE_RCSID("$NetBSD: str.c,v 1.79 2021/01/19 20:51:46 rillig Exp $");
/* Return the concatenation of s1 and s2, freshly allocated. */
char *
Index: src/usr.bin/make/trace.c
diff -u src/usr.bin/make/trace.c:1.25 src/usr.bin/make/trace.c:1.26
--- src/usr.bin/make/trace.c:1.25 Sun Dec 20 14:32:13 2020
+++ src/usr.bin/make/trace.c Tue Jan 19 20:51:46 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: trace.c,v 1.25 2020/12/20 14:32:13 rillig Exp $ */
+/* $NetBSD: trace.c,v 1.26 2021/01/19 20:51:46 rillig Exp $ */
-/*-
+/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*-
+/*
* trace.c --
* handle logging of trace events generated by various parts of make.
*
@@ -48,7 +48,7 @@
#include "job.h"
#include "trace.h"
-MAKE_RCSID("$NetBSD: trace.c,v 1.25 2020/12/20 14:32:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: trace.c,v 1.26 2021/01/19 20:51:46 rillig Exp $");
static FILE *trfile;
static pid_t trpid;
Index: src/usr.bin/make/trace.h
diff -u src/usr.bin/make/trace.h:1.5 src/usr.bin/make/trace.h:1.6
--- src/usr.bin/make/trace.h:1.5 Sat Nov 28 08:41:53 2020
+++ src/usr.bin/make/trace.h Tue Jan 19 20:51:46 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: trace.h,v 1.5 2020/11/28 08:41:53 rillig Exp $ */
+/* $NetBSD: trace.h,v 1.6 2021/01/19 20:51:46 rillig Exp $ */
-/*-
+/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*-
+/*
* trace.h --
* Definitions pertaining to the tracing of jobs in parallel mode.
*/
Index: src/usr.bin/make/filemon/filemon.h
diff -u src/usr.bin/make/filemon/filemon.h:1.4 src/usr.bin/make/filemon/filemon.h:1.5
--- src/usr.bin/make/filemon/filemon.h:1.4 Sun Nov 29 09:27:40 2020
+++ src/usr.bin/make/filemon/filemon.h Tue Jan 19 20:51:46 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: filemon.h,v 1.4 2020/11/29 09:27:40 rillig Exp $ */
+/* $NetBSD: filemon.h,v 1.5 2021/01/19 20:51:46 rillig Exp $ */
-/*-
+/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
* All rights reserved.
*
Index: src/usr.bin/make/filemon/filemon_dev.c
diff -u src/usr.bin/make/filemon/filemon_dev.c:1.6 src/usr.bin/make/filemon/filemon_dev.c:1.7
--- src/usr.bin/make/filemon/filemon_dev.c:1.6 Sun Nov 29 09:27:40 2020
+++ src/usr.bin/make/filemon/filemon_dev.c Tue Jan 19 20:51:46 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: filemon_dev.c,v 1.6 2020/11/29 09:27:40 rillig Exp $ */
+/* $NetBSD: filemon_dev.c,v 1.7 2021/01/19 20:51:46 rillig Exp $ */
-/*-
+/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
* All rights reserved.
*
Index: src/usr.bin/make/filemon/filemon_ktrace.c
diff -u src/usr.bin/make/filemon/filemon_ktrace.c:1.12 src/usr.bin/make/filemon/filemon_ktrace.c:1.13
--- src/usr.bin/make/filemon/filemon_ktrace.c:1.12 Sun Jan 10 23:59:53 2021
+++ src/usr.bin/make/filemon/filemon_ktrace.c Tue Jan 19 20:51:46 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: filemon_ktrace.c,v 1.12 2021/01/10 23:59:53 rillig Exp $ */
+/* $NetBSD: filemon_ktrace.c,v 1.13 2021/01/19 20:51:46 rillig Exp $ */
-/*-
+/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
* All rights reserved.
*
