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): remove do-not-format markers from comm...
details: https://anonhg.NetBSD.org/src/rev/ed764d8b6b0f
branches: trunk
changeset: 950192:ed764d8b6b0f
user: rillig <rillig%NetBSD.org@localhost>
date: Tue Jan 19 20:51:46 2021 +0000
description:
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.
diffstat:
usr.bin/make/compat.c | 6 +++---
usr.bin/make/cond.c | 6 +++---
usr.bin/make/filemon/filemon.h | 4 ++--
usr.bin/make/filemon/filemon_dev.c | 4 ++--
usr.bin/make/filemon/filemon_ktrace.c | 4 ++--
usr.bin/make/for.c | 6 +++---
usr.bin/make/job.c | 6 +++---
usr.bin/make/main.c | 6 +++---
usr.bin/make/make.h | 4 ++--
usr.bin/make/make_malloc.c | 6 +++---
usr.bin/make/make_malloc.h | 4 ++--
usr.bin/make/metachar.c | 7 +++----
usr.bin/make/metachar.h | 4 ++--
usr.bin/make/nonints.h | 6 +++---
usr.bin/make/str.c | 8 ++++----
usr.bin/make/trace.c | 8 ++++----
usr.bin/make/trace.h | 6 +++---
17 files changed, 47 insertions(+), 48 deletions(-)
diffs (truncated from 362 to 300 lines):
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/compat.c
--- a/usr.bin/make/compat.c Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/compat.c Tue Jan 19 20:51:46 2021 +0000
@@ -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;
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/cond.c
--- a/usr.bin/make/cond.c Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/cond.c Tue Jan 19 20:51:46 2021 +0000
@@ -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 @@
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.
*
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/filemon/filemon.h
--- a/usr.bin/make/filemon/filemon.h Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/filemon/filemon.h Tue Jan 19 20:51:46 2021 +0000
@@ -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.
*
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/filemon/filemon_dev.c
--- a/usr.bin/make/filemon/filemon_dev.c Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/filemon/filemon_dev.c Tue Jan 19 20:51:46 2021 +0000
@@ -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.
*
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/filemon/filemon_ktrace.c
--- a/usr.bin/make/filemon/filemon_ktrace.c Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/filemon/filemon_ktrace.c Tue Jan 19 20:51:46 2021 +0000
@@ -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.
*
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/for.c
--- a/usr.bin/make/for.c Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/for.c Tue Jan 19 20:51:46 2021 +0000
@@ -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 */
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/job.c
--- a/usr.bin/make/job.c Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/job.c Tue Jan 19 20:51:46 2021 +0000
@@ -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
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/main.c
--- a/usr.bin/make/main.c Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/main.c Tue Jan 19 20:51:46 2021 +0000
@@ -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 @@
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.
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/make.h
--- a/usr.bin/make/make.h Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/make.h Tue Jan 19 20:51:46 2021 +0000
@@ -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
*/
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/make_malloc.c
--- a/usr.bin/make/make_malloc.c Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/make_malloc.c Tue Jan 19 20:51:46 2021 +0000
@@ -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
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/make_malloc.h
--- a/usr.bin/make/make_malloc.h Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/make_malloc.h Tue Jan 19 20:51:46 2021 +0000
@@ -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.
*
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/metachar.c
--- a/usr.bin/make/metachar.c Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/metachar.c Tue Jan 19 20:51:46 2021 +0000
@@ -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 @@
/* x y z { | } ~ del */
0, 0, 0, 1, 1, 1, 1, 0,
};
-
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/metachar.h
--- a/usr.bin/make/metachar.h Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/metachar.h Tue Jan 19 20:51:46 2021 +0000
@@ -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.
*
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/nonints.h
--- a/usr.bin/make/nonints.h Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/nonints.h Tue Jan 19 20:51:46 2021 +0000
@@ -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.
*
diff -r 4a6a0e1e528a -r ed764d8b6b0f usr.bin/make/str.c
--- a/usr.bin/make/str.c Tue Jan 19 19:54:57 2021 +0000
+++ b/usr.bin/make/str.c Tue Jan 19 20:51:46 2021 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index