[src/trunk]: src/usr.bin/make make(1): clean up GetVarnamesToUnexport

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5f7d1f25085f
branches:  trunk
changeset: 946714:5f7d1f25085f
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Dec 06 17:27:10 2020 +0000

description:
make(1): clean up GetVarnamesToUnexport

diffstat:

 usr.bin/make/var.c |  16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diffs (58 lines):

diff -r 9306a1120ccc -r 5f7d1f25085f usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Dec 06 17:22:44 2020 +0000
+++ b/usr.bin/make/var.c        Sun Dec 06 17:27:10 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.714 2020/12/06 17:22:44 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.715 2020/12/06 17:27:10 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
 #include "metachar.h"
 
 /*     "@(#)var.c      8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.714 2020/12/06 17:22:44 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.715 2020/12/06 17:27:10 rillig Exp $");
 
 /* A string that may need to be freed after use. */
 typedef struct FStr {
@@ -752,8 +752,7 @@
 
 static void
 GetVarnamesToUnexport(const char *str,
-                     const char **out_args, FStr *out_varnames,
-                     UnexportWhat *out_what)
+                     FStr *out_varnames, UnexportWhat *out_what)
 {
        UnexportWhat what;
        FStr varnames = FSTR_INIT;
@@ -768,7 +767,6 @@
                if (what == UNEXPORT_NAMED)
                        FStr_Assign(&varnames, str, NULL);
        }
-       *out_args = str;
 
        if (what != UNEXPORT_NAMED) {
                char *expanded;
@@ -822,9 +820,8 @@
 {
        UnexportWhat what;
        FStr varnames;
-       const char *args;
-
-       GetVarnamesToUnexport(str, &args, &varnames, &what);
+
+       GetVarnamesToUnexport(str, &varnames, &what);
 
        {
                size_t i;
@@ -835,7 +832,8 @@
                        UnexportVar(varname, what);
                }
                Words_Free(words);
-               if (varnames.str != args)
+
+               if (what != UNEXPORT_NAMED)
                        Var_Delete(MAKE_EXPORTED, VAR_GLOBAL);
        }