Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make make: rename If_Eval to EvalBare
details: https://anonhg.NetBSD.org/src/rev/e9f5a8c52a36
branches: trunk
changeset: 1021630:e9f5a8c52a36
user: rillig <rillig%NetBSD.org@localhost>
date: Fri Jun 11 14:37:51 2021 +0000
description:
make: rename If_Eval to EvalBare
No functional change.
diffstat:
usr.bin/make/cond.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diffs (45 lines):
diff -r 2555447c510c -r e9f5a8c52a36 usr.bin/make/cond.c
--- a/usr.bin/make/cond.c Fri Jun 11 13:09:10 2021 +0000
+++ b/usr.bin/make/cond.c Fri Jun 11 14:37:51 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.264 2021/06/11 13:09:10 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.265 2021/06/11 14:37:51 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,7 +95,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.264 2021/06/11 13:09:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.265 2021/06/11 14:37:51 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -545,7 +545,7 @@
}
static bool
-If_Eval(const CondParser *par, const char *arg, size_t arglen)
+EvalBare(const CondParser *par, const char *arg, size_t arglen)
{
bool res = par->evalBare(arglen, arg);
return par->negateEvalBare ? !res : res;
@@ -575,7 +575,7 @@
if (par->plain)
return value[0] != '\0';
- return If_Eval(par, value, strlen(value));
+ return EvalBare(par, value, strlen(value));
}
/* Evaluate a numerical comparison, such as in ".if ${VAR} >= 9". */
@@ -862,7 +862,7 @@
* after .if must have been taken literally, so the argument cannot
* be empty - even if it contained a variable expansion.
*/
- t = ToToken(!doEval || If_Eval(par, arg, arglen));
+ t = ToToken(!doEval || EvalBare(par, arg, arglen));
free(arg);
return t;
}
Home |
Main Index |
Thread Index |
Old Index