[src/trunk]: src/usr.bin/make make(1): migrate Var_Parse in CondGetArg to Var...

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

details:   https://anonhg.NetBSD.org/src/rev/03ba00294ab8
branches:  trunk
changeset: 938230:03ba00294ab8
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Sep 04 20:32:34 2020 +0000

description:
make(1): migrate Var_Parse in CondGetArg to Var_ParsePP

diffstat:

 usr.bin/make/cond.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (41 lines):

diff -r 89fe9c3979e9 -r 03ba00294ab8 usr.bin/make/cond.c
--- a/usr.bin/make/cond.c       Fri Sep 04 20:28:15 2020 +0000
+++ b/usr.bin/make/cond.c       Fri Sep 04 20:32:34 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cond.c,v 1.109 2020/09/03 17:16:01 rillig Exp $        */
+/*     $NetBSD: cond.c,v 1.110 2020/09/04 20:32:34 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.109 2020/09/03 17:16:01 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.110 2020/09/04 20:32:34 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)cond.c     8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: cond.c,v 1.109 2020/09/03 17:16:01 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.110 2020/09/04 20:32:34 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -228,13 +228,11 @@
             * variable, so we don't do it too. Nor do we return an error,
             * though perhaps we should...
             */
-           int len;
            void *freeIt;
            VarEvalFlags eflags = VARE_UNDEFERR | (doEval ? VARE_WANTRES : 0);
-           const char *cp2 = Var_Parse(cp, VAR_CMD, eflags, &len, &freeIt);
+           const char *cp2 = Var_ParsePP(&cp, VAR_CMD, eflags, &freeIt);
            Buf_AddStr(&buf, cp2);
            free(freeIt);
-           cp += len;
            continue;
        }
        if (ch == '(')