[src/trunk]: src/usr.bin/make make(1): use FStr for memory management in Var_...

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

details:   https://anonhg.NetBSD.org/src/rev/b7b47e1b419b
branches:  trunk
changeset: 958024:b7b47e1b419b
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Dec 20 15:31:29 2020 +0000

description:
make(1): use FStr for memory management in Var_SetWithFlags

diffstat:

 usr.bin/make/var.c |  26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diffs (56 lines):

diff -r 168e896e4516 -r b7b47e1b419b usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Dec 20 15:26:40 2020 +0000
+++ b/usr.bin/make/var.c        Sun Dec 20 15:31:29 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.747 2020/12/20 15:26:40 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.748 2020/12/20 15:31:29 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -131,7 +131,7 @@
 #include "metachar.h"
 
 /*     "@(#)var.c      8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.747 2020/12/20 15:26:40 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.748 2020/12/20 15:31:29 rillig Exp $");
 
 typedef enum VarFlags {
        VAR_NONE        = 0,
@@ -949,27 +949,25 @@
                 VarSetFlags flags)
 {
        const char *unexpanded_name = name;
-       char *name_freeIt = NULL;
+       FStr varname = FStr_InitRefer(name);
 
        assert(val != NULL);
 
-       if (strchr(name, '$') != NULL) {
-               (void)Var_Subst(name, ctxt, VARE_WANTRES, &name_freeIt);
+       if (strchr(varname.str, '$') != NULL) {
+               char *expanded;
+               (void)Var_Subst(varname.str, ctxt, VARE_WANTRES, &expanded);
                /* TODO: handle errors */
-               name = name_freeIt;
+               varname = FStr_InitOwn(expanded);
        }
 
-       if (name[0] == '\0') {
+       if (varname.str[0] == '\0') {
                DEBUG2(VAR, "Var_Set(\"%s\", \"%s\", ...) "
                            "name expands to empty string - ignored\n",
                    unexpanded_name, val);
-               free(name_freeIt);
-               return;
-       }
-
-       SetVar(name, val, ctxt, flags);
-
-       free(name_freeIt);
+       } else
+               SetVar(varname.str, val, ctxt, flags);
+
+       FStr_Done(&varname);
 }
 
 /*