Replace Lst_Find calls with LST_FOREACH loops. This helps in

constification und simplifies the code because the one-liner
predicates can be inlined into the code.

1 files changed, 7 insertions, 25 deletions

diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 6debeee9ae75..b7df2bf1356a 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -305,27 +305,6 @@ CondDoDefined(int argLen, char *arg)
 
 /*-
  *-----------------------------------------------------------------------
- * CondStrMatch --
- *	Front-end for Str_Match so it returns 0 on match and non-zero
- *	on mismatch. Callback function for CondDoMake via Lst_Find
- *
- * Results:
- *	0 if string matches pattern
- *
- * Side Effects:
- *	None
- *
- *-----------------------------------------------------------------------
- */
-static int
-CondStrMatch(const void *string, const void *pattern)
-{
-
-    return (!Str_Match(string, pattern));
-}
-
-/*-
- *-----------------------------------------------------------------------
  * CondDoMake --
  *	Handle the 'make' function for conditionals.
  *
@@ -342,12 +321,15 @@ CondDoMake(int argLen, char *arg)
 {
     char    savec = arg[argLen];
     Boolean result;
+    const LstNode *ln;
 
     arg[argLen] = '\0';
-    if (Lst_Find(&create, arg, CondStrMatch) == NULL) {
-	result = FALSE;
-    } else {
-	result = TRUE;
+    result = FALSE;
+    LST_FOREACH(ln, &create) {
+	if (Str_Match(Lst_Datum(ln), arg)) {
+	    result = TRUE;
+	    break;
+	}
     }
     arg[argLen] = savec;
     return (result);