Module Name: src
Committed By: rillig
Date: Wed Dec 15 11:58:40 UTC 2021
Modified Files:
src/usr.bin/make: make.h var.c
Log Message:
make: remove space after ':' in bit-field declarations
As seen in /usr/share/misc/style.
To generate a diff of this commit:
cvs rdiff -u -r1.274 -r1.275 src/usr.bin/make/make.h
cvs rdiff -u -r1.986 -r1.987 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/make.h
diff -u src/usr.bin/make/make.h:1.274 src/usr.bin/make/make.h:1.275
--- src/usr.bin/make/make.h:1.274 Wed Dec 15 09:53:41 2021
+++ src/usr.bin/make/make.h Wed Dec 15 11:58:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.274 2021/12/15 09:53:41 rillig Exp $ */
+/* $NetBSD: make.h,v 1.275 2021/12/15 11:58:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -550,26 +550,26 @@ extern pid_t myPid;
#endif
typedef struct DebugFlags {
- bool DEBUG_ARCH: 1;
- bool DEBUG_COND: 1;
- bool DEBUG_CWD: 1;
- bool DEBUG_DIR: 1;
- bool DEBUG_ERROR: 1;
- bool DEBUG_FOR: 1;
- bool DEBUG_GRAPH1: 1;
- bool DEBUG_GRAPH2: 1;
- bool DEBUG_GRAPH3: 1;
- bool DEBUG_HASH: 1;
- bool DEBUG_JOB: 1;
- bool DEBUG_LOUD: 1;
- bool DEBUG_MAKE: 1;
- bool DEBUG_META: 1;
- bool DEBUG_PARSE: 1;
- bool DEBUG_SCRIPT: 1;
- bool DEBUG_SHELL: 1;
- bool DEBUG_SUFF: 1;
- bool DEBUG_TARG: 1;
- bool DEBUG_VAR: 1;
+ bool DEBUG_ARCH:1;
+ bool DEBUG_COND:1;
+ bool DEBUG_CWD:1;
+ bool DEBUG_DIR:1;
+ bool DEBUG_ERROR:1;
+ bool DEBUG_FOR:1;
+ bool DEBUG_GRAPH1:1;
+ bool DEBUG_GRAPH2:1;
+ bool DEBUG_GRAPH3:1;
+ bool DEBUG_HASH:1;
+ bool DEBUG_JOB:1;
+ bool DEBUG_LOUD:1;
+ bool DEBUG_MAKE:1;
+ bool DEBUG_META:1;
+ bool DEBUG_PARSE:1;
+ bool DEBUG_SCRIPT:1;
+ bool DEBUG_SHELL:1;
+ bool DEBUG_SUFF:1;
+ bool DEBUG_TARG:1;
+ bool DEBUG_VAR:1;
} DebugFlags;
#define CONCAT(a, b) a##b
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.986 src/usr.bin/make/var.c:1.987
--- src/usr.bin/make/var.c:1.986 Mon Dec 13 04:18:01 2021
+++ src/usr.bin/make/var.c Wed Dec 15 11:58:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.986 2021/12/13 04:18:01 rillig Exp $ */
+/* $NetBSD: var.c,v 1.987 2021/12/15 11:58:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.986 2021/12/13 04:18:01 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.987 2021/12/15 11:58:40 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -173,20 +173,20 @@ typedef struct Var {
Buffer val;
/* The variable came from the command line. */
- bool fromCmd: 1;
+ bool fromCmd:1;
/*
* The variable is short-lived.
* These variables are not registered in any GNode, therefore they
* must be freed after use.
*/
- bool shortLived: 1;
+ bool shortLived:1;
/*
* The variable comes from the environment.
* Appending to its value moves the variable to the global scope.
*/
- bool fromEnvironment: 1;
+ bool fromEnvironment:1;
/*
* The variable value cannot be changed anymore, and the variable
@@ -195,19 +195,19 @@ typedef struct Var {
*
* See VAR_SET_READONLY.
*/
- bool readOnly: 1;
+ bool readOnly:1;
/*
* The variable's value is currently being used by Var_Parse or
* Var_Subst. This marker is used to avoid endless recursion.
*/
- bool inUse: 1;
+ bool inUse:1;
/*
* The variable is exported to the environment, to be used by child
* processes.
*/
- bool exported: 1;
+ bool exported:1;
/*
* At the point where this variable was exported, it contained an
@@ -215,7 +215,7 @@ typedef struct Var {
* process is started, it needs to be exported again, in the hope
* that the referenced variable can then be resolved.
*/
- bool reexport: 1;
+ bool reexport:1;
} Var;
/*
@@ -248,10 +248,10 @@ typedef enum UnexportWhat {
/* Flags for pattern matching in the :S and :C modifiers */
typedef struct PatternFlags {
- bool subGlobal: 1; /* 'g': replace as often as possible */
- bool subOnce: 1; /* '1': replace only once */
- bool anchorStart: 1; /* '^': match only at start of word */
- bool anchorEnd: 1; /* '$': match only at end of word */
+ bool subGlobal:1; /* 'g': replace as often as possible */
+ bool subOnce:1; /* '1': replace only once */
+ bool anchorStart:1; /* '^': match only at start of word */
+ bool anchorEnd:1; /* '$': match only at end of word */
} PatternFlags;
/* SepBuf builds a string from words interleaved with separators. */
