[src/trunk]: src/usr.bin/make make(1): fix parameter type of CondEvalExpression

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

details:   https://anonhg.NetBSD.org/src/rev/cbd01b8c41e9
branches:  trunk
changeset: 954923:cbd01b8c41e9
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Sep 13 13:53:55 2020 +0000

description:
make(1): fix parameter type of CondEvalExpression

diffstat:

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

diffs (53 lines):

diff -r 95925c43c1ab -r cbd01b8c41e9 usr.bin/make/cond.c
--- a/usr.bin/make/cond.c       Sun Sep 13 13:50:27 2020 +0000
+++ b/usr.bin/make/cond.c       Sun Sep 13 13:53:55 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cond.c,v 1.142 2020/09/13 13:50:27 rillig Exp $        */
+/*     $NetBSD: cond.c,v 1.143 2020/09/13 13:53:55 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.142 2020/09/13 13:50:27 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.143 2020/09/13 13:53:55 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.142 2020/09/13 13:50:27 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.143 2020/09/13 13:53:55 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1020,7 +1020,7 @@
  */
 static CondEvalResult
 CondEvalExpression(const struct If *info, const char *cond, Boolean *value,
-                   int eprint, Boolean strictLHS)
+                   Boolean eprint, Boolean strictLHS)
 {
     static const struct If *dflt_info;
     CondParser par;
@@ -1055,7 +1055,7 @@
 CondEvalResult
 Cond_EvalCondition(const char *cond, Boolean *out_value)
 {
-       return CondEvalExpression(NULL, cond, out_value, 0, FALSE);
+       return CondEvalExpression(NULL, cond, out_value, FALSE, FALSE);
 }
 
 /* Evaluate the conditional in the passed line. The line looks like this:
@@ -1213,7 +1213,7 @@
     }
 
     /* And evaluate the conditional expression */
-    if (CondEvalExpression(ifp, line, &value, 1, TRUE) == COND_INVALID) {
+    if (CondEvalExpression(ifp, line, &value, TRUE, TRUE) == COND_INVALID) {
        /* Syntax error in conditional, error message already output. */
        /* Skip everything to matching .endif */
        cond_state[cond_depth] = SKIP_TO_ELSE;