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

make: remove unused INTERNAL flag

Browse Source 
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.
This commit is contained in:
rillig 2021-02-02 21:26:51 +00:00
parent 0840915c87
commit 9731a32843
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/make/enum.h
View File

@ -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>
@ -179,16 +179,16 @@ const char *Enum_FlagsToString(char *, size_t, int, const EnumToStringSpec *);
/*
* 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

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

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

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

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

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

@ -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, GNode *ctxt, VarSetFlags flags)
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);
}
/*