Module Name: src
Committed By: rillig
Date: Tue Feb 2 21:26:51 UTC 2021
Modified Files:
src/usr.bin/make: enum.h make.c make.h var.c
Log Message:
make: remove unused INTERNAL flag
It had been used for cached_realpaths, until this variable had its type
changed from GNode to HashTable in main.c 1.469 from 2020-11-14.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/make/enum.h
cvs rdiff -u -r1.239 -r1.240 src/usr.bin/make/make.c
cvs rdiff -u -r1.250 -r1.251 src/usr.bin/make/make.h
cvs rdiff -u -r1.789 -r1.790 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/enum.h
diff -u src/usr.bin/make/enum.h:1.17 src/usr.bin/make/enum.h:1.18
--- src/usr.bin/make/enum.h:1.17 Tue Feb 2 17:56:31 2021
+++ src/usr.bin/make/enum.h Tue Feb 2 21:26:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: enum.h,v 1.17 2021/02/02 17:56:31 rillig Exp $ */
+/* $NetBSD: enum.h,v 1.18 2021/02/02 21:26:51 rillig Exp $ */
/*
Copyright (c) 2020 Roland Illig <[email protected]>
@@ -179,16 +179,16 @@ const char *Enum_FlagsToString(char *, s
/*
* Declare the necessary data structures for calling Enum_FlagsToString
- * for an enum with 10 flags.
+ * for an enum with 9 flags.
*/
-#define ENUM_FLAGS_RTTI_10(typnam, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) \
+#define ENUM_FLAGS_RTTI_9(typnam, v1, v2, v3, v4, v5, v6, v7, v8, v9) \
ENUM__FLAGS_RTTI(typnam, \
ENUM__SPECS_2( \
ENUM__SPEC_8(v1, v2, v3, v4, v5, v6, v7, v8), \
- ENUM__SPEC_2(v9, v10)), \
+ ENUM__SPEC_1(v9)), \
ENUM__JOIN_2( \
ENUM__JOIN_STR_8(v1, v2, v3, v4, v5, v6, v7, v8), \
- ENUM__JOIN_STR_2(v9, v10)))
+ ENUM__JOIN_STR_1(v9)))
/*
* Declare the necessary data structures for calling Enum_FlagsToString
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.239 src/usr.bin/make/make.c:1.240
--- src/usr.bin/make/make.c:1.239 Tue Feb 2 17:56:31 2021
+++ src/usr.bin/make/make.c Tue Feb 2 21:26:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.239 2021/02/02 17:56:31 rillig Exp $ */
+/* $NetBSD: make.c,v 1.240 2021/02/02 21:26:51 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -103,7 +103,7 @@
#include "job.h"
/* "@(#)make.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: make.c,v 1.239 2021/02/02 17:56:31 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.240 2021/02/02 21:26:51 rillig Exp $");
/* Sequence # to detect recursion. */
static unsigned int checked_seqno = 1;
@@ -148,10 +148,10 @@ ENUM_FLAGS_RTTI_31(GNodeType,
OP_TRANSFORM, OP_MEMBER, OP_LIB, OP_ARCHV,
OP_HAS_COMMANDS, OP_SAVE_CMDS, OP_DEPS_FOUND, OP_MARK);
-ENUM_FLAGS_RTTI_10(GNodeFlags,
+ENUM_FLAGS_RTTI_9(GNodeFlags,
REMAKE, CHILDMADE, FORCE, DONE_WAIT,
DONE_ORDER, FROM_DEPEND, DONE_ALLSRC, CYCLE,
- DONECYCLE, INTERNAL);
+ DONECYCLE);
void
GNode_FprintDetails(FILE *f, const char *prefix, const GNode *gn,
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.250 src/usr.bin/make/make.h:1.251
--- src/usr.bin/make/make.h:1.250 Mon Feb 1 21:32:54 2021
+++ src/usr.bin/make/make.h Tue Feb 2 21:26:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.250 2021/02/01 21:32:54 rillig Exp $ */
+/* $NetBSD: make.h,v 1.251 2021/02/02 21:26:51 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -350,9 +350,7 @@ typedef enum GNodeFlags {
/* Used by MakePrintStatus */
CYCLE = 1 << 12,
/* Used by MakePrintStatus */
- DONECYCLE = 1 << 13,
- /* Internal use only */
- INTERNAL = 1 << 14
+ DONECYCLE = 1 << 13
} GNodeFlags;
typedef struct List StringList;
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.789 src/usr.bin/make/var.c:1.790
--- src/usr.bin/make/var.c:1.789 Tue Feb 2 16:18:16 2021
+++ src/usr.bin/make/var.c Tue Feb 2 21:26:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.789 2021/02/02 16:18:16 rillig Exp $ */
+/* $NetBSD: var.c,v 1.790 2021/02/02 21:26:51 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -131,7 +131,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.789 2021/02/02 16:18:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.790 2021/02/02 21:26:51 rillig Exp $");
typedef enum VarFlags {
VAR_NONE = 0,
@@ -475,8 +475,7 @@ VarAdd(const char *name, const char *val
Var *v = VarNew(FStr_InitRefer(/* aliased to */ he->key), val,
flags & VAR_SET_READONLY ? VAR_READONLY : VAR_NONE);
HashEntry_Set(he, v);
- if (!(ctxt->flags & INTERNAL))
- DEBUG3(VAR, "%s:%s = %s\n", ctxt->name, name, val);
+ DEBUG3(VAR, "%s:%s = %s\n", ctxt->name, name, val);
}
/*
