[src/trunk]: src/usr.bin/make make(1): extract FreeEnvVar from Var_Parse

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

details:   https://anonhg.NetBSD.org/src/rev/2b5d30e0a13c
branches:  trunk
changeset: 978883:2b5d30e0a13c
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Dec 06 13:51:06 2020 +0000

description:
make(1): extract FreeEnvVar from Var_Parse

diffstat:

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

diffs (57 lines):

diff -r 8c8ea64ff4f9 -r 2b5d30e0a13c usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Dec 06 13:45:58 2020 +0000
+++ b/usr.bin/make/var.c        Sun Dec 06 13:51:06 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.708 2020/12/06 10:49:02 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.709 2020/12/06 13:51:06 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.708 2020/12/06 10:49:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.709 2020/12/06 13:51:06 rillig Exp $");
 
 ENUM_FLAGS_RTTI_3(VarEvalFlags,
                  VARE_UNDEFERR, VARE_WANTRES, VARE_KEEP_DOLLAR);
@@ -3882,6 +3882,20 @@
        return TRUE;
 }
 
+/* Free the environment variable now since we own it. */
+static void
+FreeEnvVar(void **out_val_freeIt, Var *v, const char *value)
+{
+       char *varValue = Buf_Destroy(&v->val, FALSE);
+       if (value == varValue)
+               *out_val_freeIt = varValue;
+       else
+               free(varValue);
+
+       free(v->name_freeIt);
+       free(v);
+}
+
 /*
  * Given the start of a variable expression (such as $v, $(VAR),
  * ${VAR:Mpattern}), extract the variable name and value, and the modifiers,
@@ -4033,16 +4047,7 @@
        *pp = p;
 
        if (v->flags & VAR_FROM_ENV) {
-               /* Free the environment variable now since we own it. */
-
-               char *varValue = Buf_Destroy(&v->val, FALSE);
-               if (value == varValue)
-                       *out_val_freeIt = varValue;
-               else
-                       free(varValue);
-
-               free(v->name_freeIt);
-               free(v);
+               FreeEnvVar(out_val_freeIt, v, value);
 
        } else if (exprFlags & VEF_UNDEF) {
                if (!(exprFlags & VEF_DEF)) {