summaryrefslogtreecommitdiff
path: root/usr.bin/make/parse.c
diff options
context:
space:
mode:
authorrillig <rillig@NetBSD.org>2020-09-13 13:50:27 +0000
committerrillig <rillig@NetBSD.org>2020-09-13 13:50:27 +0000
commit2d3dc5e3fa4f3a22f1bf2f9204941e67a3ec0140 (patch)
tree317024640dbff9353dd0222578a27576882198f3 /usr.bin/make/parse.c
parentac703db2e55008253a31cc41dc39e650cd4e29ad (diff)
make(1): clean up API for evaluating conditions
There was no need to make struct If publicly visible. There was no need to have parameters in the public API that were passed the same constants all the time. The former function names had not been distinctive.
Diffstat (limited to 'usr.bin/make/parse.c')
-rw-r--r--usr.bin/make/parse.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index c128b4ba230..0e4831822b9 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.301 2020/09/13 13:25:07 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.302 2020/09/13 13:50:27 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.301 2020/09/13 13:25:07 rillig Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.302 2020/09/13 13:50:27 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: parse.c,v 1.301 2020/09/13 13:25:07 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.302 2020/09/13 13:50:27 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -2774,12 +2774,12 @@ ParseReadLine(void)
* The line might be a conditional. Ask the conditional module
* about it and act accordingly
*/
- switch (Cond_Eval(line)) {
+ switch (Cond_EvalLine(line)) {
case COND_SKIP:
/* Skip to next conditional that evaluates to COND_PARSE. */
do {
line = ParseGetLine(PARSE_SKIP, &lineLength);
- } while (line && Cond_Eval(line) != COND_PARSE);
+ } while (line && Cond_EvalLine(line) != COND_PARSE);
if (line == NULL)
break;
continue;