Module Name: src
Committed By: rillig
Date: Mon Feb 22 20:38:55 UTC 2021
Modified Files:
src/usr.bin/make: targ.c
src/usr.bin/make/unit-tests: cond-func-empty.mk varparse-dynamic.mk
Log Message:
make: update constant names in comments
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/usr.bin/make/targ.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/cond-func-empty.mk
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varparse-dynamic.mk
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/targ.c
diff -u src/usr.bin/make/targ.c:1.165 src/usr.bin/make/targ.c:1.166
--- src/usr.bin/make/targ.c:1.165 Thu Feb 4 21:42:46 2021
+++ src/usr.bin/make/targ.c Mon Feb 22 20:38:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: targ.c,v 1.165 2021/02/04 21:42:46 rillig Exp $ */
+/* $NetBSD: targ.c,v 1.166 2021/02/22 20:38:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -113,7 +113,7 @@
#include "dir.h"
/* "@(#)targ.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: targ.c,v 1.165 2021/02/04 21:42:46 rillig Exp $");
+MAKE_RCSID("$NetBSD: targ.c,v 1.166 2021/02/22 20:38:55 rillig Exp $");
/*
* All target nodes that appeared on the left-hand side of one of the
@@ -246,7 +246,7 @@ GNode_Free(void *gnp)
* SCOPE_GLOBAL), it should be safe to free the variables as well,
* since each node manages the memory for all its variables itself.
*
- * XXX: The GNodes that are only used as variable scopes (VAR_CMD,
+ * XXX: The GNodes that are only used as variable scopes (SCOPE_CMD,
* SCOPE_GLOBAL, SCOPE_INTERNAL) are not freed at all (see Var_End,
* where they are not mentioned). These might be freed at all, if
* their variable values are indeed not used anywhere else (see
Index: src/usr.bin/make/unit-tests/cond-func-empty.mk
diff -u src/usr.bin/make/unit-tests/cond-func-empty.mk:1.11 src/usr.bin/make/unit-tests/cond-func-empty.mk:1.12
--- src/usr.bin/make/unit-tests/cond-func-empty.mk:1.11 Sat Nov 28 14:08:37 2020
+++ src/usr.bin/make/unit-tests/cond-func-empty.mk Mon Feb 22 20:38:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: cond-func-empty.mk,v 1.11 2020/11/28 14:08:37 rillig Exp $
+# $NetBSD: cond-func-empty.mk,v 1.12 2021/02/22 20:38:55 rillig Exp $
#
# Tests for the empty() function in .if conditions, which tests a variable
# expression for emptiness.
@@ -42,7 +42,7 @@ WORD= word
.endif
# The :U modifier modifies expressions based on undefined variables
-# (VAR_JUNK) by adding the VAR_KEEP flag, which marks the expression
+# (DEF_UNDEF) by adding the DEF_DEFINED flag, which marks the expression
# as "being interesting enough to be further processed".
#
.if empty(UNDEF:S,^$,value,W:Ufallback)
Index: src/usr.bin/make/unit-tests/varparse-dynamic.mk
diff -u src/usr.bin/make/unit-tests/varparse-dynamic.mk:1.4 src/usr.bin/make/unit-tests/varparse-dynamic.mk:1.5
--- src/usr.bin/make/unit-tests/varparse-dynamic.mk:1.4 Thu Feb 4 21:42:47 2021
+++ src/usr.bin/make/unit-tests/varparse-dynamic.mk Mon Feb 22 20:38:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: varparse-dynamic.mk,v 1.4 2021/02/04 21:42:47 rillig Exp $
+# $NetBSD: varparse-dynamic.mk,v 1.5 2021/02/22 20:38:55 rillig Exp $
# Before 2020-07-27, there was an off-by-one error in Var_Parse that skipped
# the last character in the variable name.
@@ -15,8 +15,8 @@
# expression is returned as the variable value, hoping that it can be
# resolved at a later point.
#
-# This test covers the code in Var_Parse that deals with VAR_JUNK but not
-# VAR_KEEP for dynamic variables.
+# This test covers the code in Var_Parse that deals with DEF_UNDEF but not
+# DEF_DEFINED for dynamic variables.
.if ${.TARGET:S,^,,} != "\${.TARGET:S,^,,}"
. error
.endif
