Module Name: src
Committed By: rillig
Date: Fri Sep 4 20:32:34 UTC 2020
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make(1): migrate Var_Parse in CondGetArg to Var_ParsePP
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/usr.bin/make/cond.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/cond.c
diff -u src/usr.bin/make/cond.c:1.109 src/usr.bin/make/cond.c:1.110
--- src/usr.bin/make/cond.c:1.109 Thu Sep 3 17:16:01 2020
+++ src/usr.bin/make/cond.c Fri Sep 4 20:32:34 2020
@@ -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 @@ CondGetArg(Boolean doEval, const char **
* 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 == '(')
