Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make: in irrelevant function calls in conditions, return false 

When a condition contains an irrelevant function call, it doesn't matter
whether the function call evaluates to true or to false, it will be
discarded anyway by either CondParser_And or CondParser_Or.

Returning false instead of true makes the code simpler, plus it is more
common to return false for irrelevant results.

No functional change.
This commit is contained in:
rillig 2021-12-29 08:23:40 +00:00
parent dfb79a6573
commit d5e7b1f687
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/make/cond.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cond.c,v 1.315 2021/12/29 08:15:45 rillig Exp $ */
/* $NetBSD: cond.c,v 1.316 2021/12/29 08:23:40 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.315 2021/12/29 08:15:45 rillig Exp $");
MAKE_RCSID("$NetBSD: cond.c,v 1.316 2021/12/29 08:23:40 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@ -762,7 +762,7 @@ CondParser_FuncCall(CondParser *par, bool doEval, Token *out_token)
return false;
ok = ParseWord(par, &p, doEval, fn_name, &arg);
*out_token = ToToken(ok && (!doEval || fn(arg)));
*out_token = ToToken(ok && doEval && fn(arg));
free(arg);
par->p = p;