Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
rillig 2021-01-19 20:51:46 +00:00
parent 1f01563cf6
commit 85aee7a6f7
17 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/make/compat.c
View File

@ -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;

6
usr.bin/make/cond.c
View File

@ -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.
*

4
usr.bin/make/filemon/filemon.h
View File

@ -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.
*

4
usr.bin/make/filemon/filemon_dev.c
View File

@ -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.
*

4
usr.bin/make/filemon/filemon_ktrace.c
View File

@ -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.
*

6
usr.bin/make/for.c
View File

@ -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 */

6
usr.bin/make/job.c
View File

@ -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

6
usr.bin/make/main.c
View File

@ -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.

4
usr.bin/make/make.h
View File

@ -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
*/

6
usr.bin/make/make_malloc.c
View File

@ -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

4
usr.bin/make/make_malloc.h
View File

@ -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.
*

7
usr.bin/make/metachar.c
View File

@ -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,
};

4
usr.bin/make/metachar.h
View File

@ -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.
*

6
usr.bin/make/nonints.h
View File

@ -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.
*

8
usr.bin/make/str.c
View File

@ -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 *

8
usr.bin/make/trace.c
View File

@ -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;

6
usr.bin/make/trace.h
View File

@ -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.
*/