Module Name: src
Committed By: rillig
Date: Fri Feb 5 04:41:17 UTC 2021
Modified Files:
src/usr.bin/make: dir.c main.c nonints.h parse.c var.c
Log Message:
make: add shortcut Global_Delete for deleting a global variable
To generate a diff of this commit:
cvs rdiff -u -r1.268 -r1.269 src/usr.bin/make/dir.c
cvs rdiff -u -r1.530 -r1.531 src/usr.bin/make/main.c
cvs rdiff -u -r1.200 -r1.201 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.546 -r1.547 src/usr.bin/make/parse.c
cvs rdiff -u -r1.803 -r1.804 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/dir.c
diff -u src/usr.bin/make/dir.c:1.268 src/usr.bin/make/dir.c:1.269
--- src/usr.bin/make/dir.c:1.268 Thu Feb 4 21:33:13 2021
+++ src/usr.bin/make/dir.c Fri Feb 5 04:41:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.268 2021/02/04 21:33:13 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.269 2021/02/05 04:41:17 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.268 2021/02/04 21:33:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.269 2021/02/05 04:41:17 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", SCOPE_GLOBAL);
+ Global_Delete(".PATH");
if ((ln = dirSearchPath.dirs.first) != NULL) {
CachedDir *dir = ln->datum;
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.530 src/usr.bin/make/main.c:1.531
--- src/usr.bin/make/main.c:1.530 Thu Feb 4 21:33:13 2021
+++ src/usr.bin/make/main.c Fri Feb 5 04:41:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.530 2021/02/04 21:33:13 rillig Exp $ */
+/* $NetBSD: main.c,v 1.531 2021/02/05 04:41:17 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.530 2021/02/04 21:33:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.531 2021/02/05 04:41:17 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -2105,7 +2105,7 @@ SetErrorVars(GNode *gn)
* We can print this even if there is no .ERROR target.
*/
Global_Set(".ERROR_TARGET", gn->name);
- Var_Delete(".ERROR_CMD", SCOPE_GLOBAL);
+ Global_Delete(".ERROR_CMD");
for (ln = gn->commands.first; ln != NULL; ln = ln->next) {
const char *cmd = ln->datum;
Index: src/usr.bin/make/nonints.h
diff -u src/usr.bin/make/nonints.h:1.200 src/usr.bin/make/nonints.h:1.201
--- src/usr.bin/make/nonints.h:1.200 Thu Feb 4 21:50:39 2021
+++ src/usr.bin/make/nonints.h Fri Feb 5 04:41:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.200 2021/02/04 21:50:39 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.201 2021/02/05 04:41:17 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -393,6 +393,7 @@ void Var_UnExport(Boolean, const char *)
void Global_Set(const char *, const char *);
void Global_SetExpand(const char *, const char *);
void Global_Append(const char *, const char *);
+void Global_Delete(const char *);
/* util.c */
typedef void (*SignalProc)(int);
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.546 src/usr.bin/make/parse.c:1.547
--- src/usr.bin/make/parse.c:1.546 Thu Feb 4 21:42:46 2021
+++ src/usr.bin/make/parse.c Fri Feb 5 04:41:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.546 2021/02/04 21:42:46 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.547 2021/02/05 04:41:17 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.546 2021/02/04 21:42:46 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.547 2021/02/05 04:41:17 rillig Exp $");
/* types and constants */
@@ -2321,8 +2321,8 @@ ParseSetParseFile(const char *filename)
SetFilenameVars(including,
".INCLUDEDFROMDIR", ".INCLUDEDFROMFILE");
} else {
- Var_Delete(".INCLUDEDFROMDIR", SCOPE_GLOBAL);
- Var_Delete(".INCLUDEDFROMFILE", SCOPE_GLOBAL);
+ Global_Delete(".INCLUDEDFROMDIR");
+ Global_Delete(".INCLUDEDFROMFILE");
}
}
@@ -2594,10 +2594,10 @@ ParseEOF(void)
if (includes.len == 0) {
/* We've run out of input */
- Var_Delete(".PARSEDIR", SCOPE_GLOBAL);
- Var_Delete(".PARSEFILE", SCOPE_GLOBAL);
- Var_Delete(".INCLUDEDFROMDIR", SCOPE_GLOBAL);
- Var_Delete(".INCLUDEDFROMFILE", SCOPE_GLOBAL);
+ Global_Delete(".PARSEDIR");
+ Global_Delete(".PARSEFILE");
+ Global_Delete(".INCLUDEDFROMDIR");
+ Global_Delete(".INCLUDEDFROMFILE");
return FALSE;
}
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.803 src/usr.bin/make/var.c:1.804
--- src/usr.bin/make/var.c:1.803 Thu Feb 4 21:50:39 2021
+++ src/usr.bin/make/var.c Fri Feb 5 04:41:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.803 2021/02/04 21:50:39 rillig Exp $ */
+/* $NetBSD: var.c,v 1.804 2021/02/05 04:41:17 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.803 2021/02/04 21:50:39 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.804 2021/02/05 04:41:17 rillig Exp $");
typedef enum VarFlags {
VAR_NONE = 0,
@@ -564,7 +564,7 @@ Var_Undef(const char *arg)
for (i = 0; i < varnames.len; i++) {
const char *varname = varnames.words[i];
- Var_Delete(varname, SCOPE_GLOBAL);
+ Global_Delete(varname);
}
Words_Free(varnames);
@@ -898,7 +898,7 @@ UnexportVars(FStr *varnames, UnexportWha
Words_Free(words);
if (what != UNEXPORT_NAMED)
- Var_Delete(MAKE_EXPORTED, SCOPE_GLOBAL);
+ Global_Delete(MAKE_EXPORTED);
}
/*
@@ -1063,6 +1063,12 @@ Global_SetExpand(const char *name, const
Var_SetExpand(name, value, SCOPE_GLOBAL);
}
+void
+Global_Delete(const char *name)
+{
+ Var_Delete(name, SCOPE_GLOBAL);
+}
+
/*
* Append the value to the named variable.
*
