summaryrefslogtreecommitdiff
path: root/usr.bin/make/dir.c
diff options
context:
space:
mode:
authorrillig <rillig@NetBSD.org>2021-02-04 21:33:13 +0000
committerrillig <rillig@NetBSD.org>2021-02-04 21:33:13 +0000
commit7aff596cfc58c4b52e5a0b17365a1ad85f2c751a (patch)
tree47f4d7805aa1e42043ed5841c340b81bc96b6d2c /usr.bin/make/dir.c
parentdd4157ea8bf4ac0b3e75e10f2c10eb5d9bae3679 (diff)
make: rename some VAR constants to SCOPE
The word "context" does not fit perfectly to the variables that are associate with a GNode, as the context is usually something from the outside and the variables are more like properties inherent to the GNode. The term "global context" fits even less. Since the thing where variables are looked up is commonly named a scope, use that term instead. This commit only renames the global variables VAR_GLOBAL, VAR_INTERNAL and VAR_CMDLINE, plus a few very closely related comments. These are: GNode.vars (because of line breaks) GNode_Free (dito) varname-make_print_var_on_error.mk varname-make_print_var_on_error-jobs.mk The debug message in Var_Stats is left as-is since there is no unit test for it yet. The other renamings (variable names "context", "ctxt", as well as further comments) will be done in a follow-up commit.
Diffstat (limited to 'usr.bin/make/dir.c')
-rw-r--r--usr.bin/make/dir.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 0b551f29a41..d3a0946fcbb 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.267 2021/02/03 13:53:12 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.268 2021/02/04 21:33:13 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -138,7 +138,7 @@
#include "job.h"
/* "@(#)dir.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: dir.c,v 1.267 2021/02/03 13:53:12 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.268 2021/02/04 21:33:13 rillig Exp $");
/*
* A search path is a list of CachedDir structures. A CachedDir has in it the
@@ -549,7 +549,7 @@ Dir_SetPATH(void)
CachedDirListNode *ln;
Boolean seenDotLast = FALSE; /* true if we should search '.' last */
- Var_Delete(".PATH", VAR_GLOBAL);
+ Var_Delete(".PATH", SCOPE_GLOBAL);
if ((ln = dirSearchPath.dirs.first) != NULL) {
CachedDir *dir = ln->datum;