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: remove unused INTERNAL flag



details:   https://anonhg.NetBSD.org/src/rev/1e094fb8dc84
branches:  trunk
changeset: 959158:1e094fb8dc84
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Feb 02 21:26:51 2021 +0000

description:
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.

diffstat:

 usr.bin/make/enum.h |  10 +++++-----
 usr.bin/make/make.c |   8 ++++----
 usr.bin/make/make.h |   6 ++----
 usr.bin/make/var.c  |   7 +++----
 4 files changed, 14 insertions(+), 17 deletions(-)

diffs (109 lines):

diff -r e1286e6cdc8b -r 1e094fb8dc84 usr.bin/make/enum.h
--- a/usr.bin/make/enum.h       Tue Feb 02 17:56:31 2021 +0000
+++ b/usr.bin/make/enum.h       Tue Feb 02 21:26:51 2021 +0000
@@ -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 <rillig%NetBSD.org@localhost>
@@ -179,16 +179,16 @@
 
 /*
  * 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
diff -r e1286e6cdc8b -r 1e094fb8dc84 usr.bin/make/make.c
--- a/usr.bin/make/make.c       Tue Feb 02 17:56:31 2021 +0000
+++ b/usr.bin/make/make.c       Tue Feb 02 21:26:51 2021 +0000
@@ -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 @@
     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,
diff -r e1286e6cdc8b -r 1e094fb8dc84 usr.bin/make/make.h
--- a/usr.bin/make/make.h       Tue Feb 02 17:56:31 2021 +0000
+++ b/usr.bin/make/make.h       Tue Feb 02 21:26:51 2021 +0000
@@ -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 @@
        /* 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;
diff -r e1286e6cdc8b -r 1e094fb8dc84 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Tue Feb 02 17:56:31 2021 +0000
+++ b/usr.bin/make/var.c        Tue Feb 02 21:26:51 2021 +0000
@@ -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 @@
        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);
 }
 
 /*



Home | Main Index | Thread Index | Old Index