[src/trunk]: src/usr.bin/make make(1): merge Lst_ForEachFrom into Lst_ForEach...

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

details:   https://anonhg.NetBSD.org/src/rev/cdacc61aa641
branches:  trunk
changeset: 944233:cdacc61aa641
user:      rillig <rillig%NetBSD.org@localhost>
date:      Thu Sep 24 07:23:26 2020 +0000

description:
make(1): merge Lst_ForEachFrom into Lst_ForEachUntil

diffstat:

 usr.bin/make/lst.c |  39 ++++++++++-----------------------------
 1 files changed, 10 insertions(+), 29 deletions(-)

diffs (85 lines):

diff -r 360cd32be974 -r cdacc61aa641 usr.bin/make/lst.c
--- a/usr.bin/make/lst.c        Thu Sep 24 07:11:29 2020 +0000
+++ b/usr.bin/make/lst.c        Thu Sep 24 07:23:26 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lst.c,v 1.67 2020/09/24 07:11:29 rillig Exp $ */
+/* $NetBSD: lst.c,v 1.68 2020/09/24 07:23:26 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -36,7 +36,7 @@
 
 #include "make.h"
 
-MAKE_RCSID("$NetBSD: lst.c,v 1.67 2020/09/24 07:11:29 rillig Exp $");
+MAKE_RCSID("$NetBSD: lst.c,v 1.68 2020/09/24 07:23:26 rillig Exp $");
 
 struct ListNode {
     struct ListNode *prev;     /* previous element in list */
@@ -415,42 +415,21 @@
     return NULL;
 }
 
-static int Lst_ForEachFrom(List *, ListNode *, LstActionUntilProc, void *);
-
 /* Apply the given function to each element of the given list. The function
  * should return 0 if traversal should continue and non-zero if it should
  * abort. */
 int
 Lst_ForEachUntil(List *list, LstActionUntilProc proc, void *procData)
 {
-    if (LstIsEmpty(list))
-       return 0;               /* XXX: Document what this value means. */
-    return Lst_ForEachFrom(list, Lst_First(list), proc, procData);
-}
+    ListNode *tln = list->first;
+    int result = 0;
 
-/* Apply the given function to each element of the given list, starting from
- * the given node. The function should return 0 if traversal should continue,
- * and non-zero if it should abort. */
-int
-Lst_ForEachFrom(List *list, ListNode *node,
-                LstActionUntilProc proc, void *procData)
-{
-    ListNode *tln = node;
-    ListNode *next;
-    Boolean done;
-    int result;
-
-    assert(list != NULL);
-    assert(node != NULL);
-    assert(proc != NULL);
-
-    do {
+    while (tln != NULL) {
        /*
         * Take care of having the current element deleted out from under
         * us.
         */
-
-       next = tln->next;
+       ListNode *next = tln->next;
 
        /*
         * We're done with the traversal if
@@ -458,7 +437,7 @@
         *  - nothing's been added after the current node (check this
         *    after proc() has been called).
         */
-       done = next == NULL;
+       Boolean done = next == NULL;
 
        tln->useCount++;
        result = (*proc)(tln->datum, procData);
@@ -478,7 +457,9 @@
            free((char *)tln);
        }
        tln = next;
-    } while (!result && !LstIsEmpty(list) && !done);
+       if (result || LstIsEmpty(list) || done)
+           break;
+    }
 
     return result;
 }