Module Name: src
Committed By: rillig
Date: Sun Aug 2 12:43:40 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): eliminate another unnecessary UNCONST in Var_Delete
To generate a diff of this commit:
cvs rdiff -u -r1.396 -r1.397 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/var.c
diff -u src/usr.bin/make/var.c:1.396 src/usr.bin/make/var.c:1.397
--- src/usr.bin/make/var.c:1.396 Sun Aug 2 10:49:53 2020
+++ src/usr.bin/make/var.c Sun Aug 2 12:43:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.396 2020/08/02 10:49:53 rillig Exp $ */
+/* $NetBSD: var.c,v 1.397 2020/08/02 12:43:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.396 2020/08/02 10:49:53 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.397 2020/08/02 12:43:40 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.396 2020/08/02 10:49:53 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.397 2020/08/02 12:43:40 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -458,21 +458,16 @@ VarAdd(const char *name, const char *val
void
Var_Delete(const char *name, GNode *ctxt)
{
- Hash_Entry *ln;
- char *cp;
-
- if (strchr(name, '$') != NULL) {
- cp = Var_Subst(name, VAR_GLOBAL, VARE_WANTRES);
- } else {
- cp = UNCONST(name);
- }
- ln = Hash_FindEntry(&ctxt->context, cp);
+ char *name_freeIt = NULL;
+ if (strchr(name, '$') != NULL)
+ name = name_freeIt = Var_Subst(name, VAR_GLOBAL, VARE_WANTRES);
+ Hash_Entry *ln = Hash_FindEntry(&ctxt->context, name);
if (DEBUG(VAR)) {
fprintf(debug_file, "%s:delete %s%s\n",
- ctxt->name, cp, ln ? "" : " (not found)");
+ ctxt->name, name, ln != NULL ? "" : " (not found)");
}
- if (cp != name)
- free(cp);
+ free(name_freeIt);
+
if (ln != NULL) {
Var *v = (Var *)Hash_GetValue(ln);
if (v->flags & VAR_EXPORTED)
