Module Name: src
Committed By: rillig
Date: Wed Feb 3 15:08:17 UTC 2021
Modified Files:
src/usr.bin/make: meta.c nonints.h var.c
Log Message:
make: rename Var_Delete to Var_DeleteExpand, Var_DeleteVar to Var_Delete
The function names now follow the naming scheme from the other functions
that handle variables.
There are several calls that remain syntactically unchanged but that
omit the call to strchr('$') now. Since all these calls use constant
variable names, there is no functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/usr.bin/make/meta.c
cvs rdiff -u -r1.195 -r1.196 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.796 -r1.797 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/meta.c
diff -u src/usr.bin/make/meta.c:1.173 src/usr.bin/make/meta.c:1.174
--- src/usr.bin/make/meta.c:1.173 Wed Feb 3 13:53:12 2021
+++ src/usr.bin/make/meta.c Wed Feb 3 15:08:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.173 2021/02/03 13:53:12 rillig Exp $ */
+/* $NetBSD: meta.c,v 1.174 2021/02/03 15:08:17 rillig Exp $ */
/*
* Implement 'meta' mode.
@@ -1251,8 +1251,8 @@ meta_oodate(GNode *gn, Boolean oodate)
/* Process according to record type. */
switch (buf[0]) {
case 'X': /* eXit */
- Var_Delete(lcwd_vname, VAR_GLOBAL);
- Var_Delete(ldir_vname, VAR_GLOBAL);
+ Var_DeleteExpand(lcwd_vname, VAR_GLOBAL);
+ Var_DeleteExpand(ldir_vname, VAR_GLOBAL);
lastpid = 0; /* no need to save ldir_vname */
break;
Index: src/usr.bin/make/nonints.h
diff -u src/usr.bin/make/nonints.h:1.195 src/usr.bin/make/nonints.h:1.196
--- src/usr.bin/make/nonints.h:1.195 Wed Feb 3 14:33:09 2021
+++ src/usr.bin/make/nonints.h Wed Feb 3 15:08:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.195 2021/02/03 14:33:09 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.196 2021/02/03 15:08:17 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -368,8 +368,8 @@ typedef enum VarExportMode {
VEM_LITERAL
} VarExportMode;
-void Var_DeleteVar(const char *, GNode *);
void Var_Delete(const char *, GNode *);
+void Var_DeleteExpand(const char *, GNode *);
void Var_Undef(const char *);
void Global_Set(const char *, const char *);
void Global_SetExpand(const char *, const char *);
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.796 src/usr.bin/make/var.c:1.797
--- src/usr.bin/make/var.c:1.796 Wed Feb 3 14:33:09 2021
+++ src/usr.bin/make/var.c Wed Feb 3 15:08:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.796 2021/02/03 14:33:09 rillig Exp $ */
+/* $NetBSD: var.c,v 1.797 2021/02/03 15:08:17 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -100,7 +100,9 @@
*
* Var_Parse Parse a variable expression such as ${VAR:Mpattern}.
*
- * Var_Delete Delete a variable.
+ * Var_Delete
+ * Var_DeleteExpand
+ * Delete a variable.
*
* Var_ReexportVars
* Export some or even all variables to the environment
@@ -135,7 +137,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.796 2021/02/03 14:33:09 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.797 2021/02/03 15:08:17 rillig Exp $");
typedef enum VarFlags {
VAR_NONE = 0,
@@ -487,7 +489,7 @@ VarAdd(const char *name, const char *val
* The variable name is kept as-is, it is not expanded.
*/
void
-Var_DeleteVar(const char *varname, GNode *ctxt)
+Var_Delete(const char *varname, GNode *ctxt)
{
HashEntry *he = HashTable_FindEntry(&ctxt->vars, varname);
Var *v;
@@ -514,7 +516,7 @@ Var_DeleteVar(const char *varname, GNode
* The variable name is expanded once.
*/
void
-Var_Delete(const char *name, GNode *ctxt)
+Var_DeleteExpand(const char *name, GNode *ctxt)
{
FStr varname = FStr_InitRefer(name);
@@ -526,7 +528,7 @@ Var_Delete(const char *name, GNode *ctxt
varname = FStr_InitOwn(expanded);
}
- Var_DeleteVar(varname.str, ctxt);
+ Var_Delete(varname.str, ctxt);
FStr_Done(&varname);
}
@@ -561,7 +563,7 @@ Var_Undef(const char *arg)
for (i = 0; i < varnames.len; i++) {
const char *varname = varnames.words[i];
- Var_DeleteVar(varname, VAR_GLOBAL);
+ Var_Delete(varname, VAR_GLOBAL);
}
Words_Free(varnames);
@@ -952,7 +954,7 @@ SetVar(const char *name, const char *val
* needed. Otherwise -V name may show the wrong value.
*/
/* XXX: name is expanded for the second time */
- Var_Delete(name, VAR_GLOBAL);
+ Var_DeleteExpand(name, VAR_GLOBAL);
}
VarAdd(name, val, ctxt, flags);
} else {
@@ -2361,7 +2363,7 @@ ApplyModifier_Loop(const char **pp, cons
ModifyWords(val, ModifyWord_Loop, &args, st->oneBigWord, st->sep));
st->sep = prev_sep;
/* XXX: Consider restoring the previous variable instead of deleting. */
- Var_Delete(args.tvar, st->ctxt);
+ Var_DeleteExpand(args.tvar, st->ctxt);
free(args.tvar);
free(args.str);
return AMR_OK;
