[src/trunk]: src/usr.bin/make make(1): remove void pointers from MakePrintStatus

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

details:   https://anonhg.NetBSD.org/src/rev/e72d332cf136
branches:  trunk
changeset: 945158:e72d332cf136
user:      rillig <rillig%NetBSD.org@localhost>
date:      Thu Oct 22 21:49:44 2020 +0000

description:
make(1): remove void pointers from MakePrintStatus

diffstat:

 usr.bin/make/make.c |  24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r 18d168c4cc26 -r e72d332cf136 usr.bin/make/make.c
--- a/usr.bin/make/make.c       Thu Oct 22 21:43:56 2020 +0000
+++ b/usr.bin/make/make.c       Thu Oct 22 21:49:44 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.c,v 1.173 2020/10/22 21:43:56 rillig Exp $        */
+/*     $NetBSD: make.c,v 1.174 2020/10/22 21:49:44 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -107,7 +107,7 @@
 #include    "job.h"
 
 /*     "@(#)make.c     8.1 (Berkeley) 6/6/93"  */
-MAKE_RCSID("$NetBSD: make.c,v 1.173 2020/10/22 21:43:56 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.174 2020/10/22 21:49:44 rillig Exp $");
 
 /* Sequence # to detect recursion. */
 static unsigned int checked = 1;
@@ -1032,16 +1032,15 @@
         MakePrintStatusOrderNode(ln->datum, gn);
 }
 
+static void MakePrintStatusList(GNodeList *, int *);
+
 /* Print the status of a top-level node, viz. it being up-to-date already
  * or not created due to an error in a lower level.
  * Callback function for Make_Run via Lst_ForEachUntil.
  */
 static int
-MakePrintStatus(void *gnp, void *v_errors)
+MakePrintStatus(GNode *gn, int *errors)
 {
-    GNode *gn = gnp;
-    int *errors = v_errors;
-
     if (gn->flags & DONECYCLE)
        /* We've completely processed this node before, don't do it again. */
        return 0;
@@ -1089,7 +1088,7 @@
     if (!(gn->flags & CYCLE)) {
        /* Fist time we've seen this node, check all children */
        gn->flags |= CYCLE;
-       Lst_ForEachUntil(gn->children, MakePrintStatus, errors);
+       MakePrintStatusList(gn->children, errors);
        /* Mark that this node needn't be processed again */
        gn->flags |= DONECYCLE;
        return 0;
@@ -1103,10 +1102,17 @@
        return 1;
 
     /* Reporting for our children will give the rest of the loop */
-    Lst_ForEachUntil(gn->children, MakePrintStatus, errors);
+    MakePrintStatusList(gn->children, errors);
     return 0;
 }
 
+static void
+MakePrintStatusList(GNodeList *gnodes, int *errors)
+{
+    GNodeListNode *ln;
+    for (ln = gnodes->first; ln != NULL; ln = ln->next)
+        MakePrintStatus(ln->datum, errors);
+}
 
 /* Expand .USE nodes and create a new targets list.
  *
@@ -1347,7 +1353,7 @@
      */
     DEBUG1(MAKE, "done: errors %d\n", errors);
     if (errors == 0) {
-       Lst_ForEachUntil(targs, MakePrintStatus, &errors);
+       MakePrintStatusList(targs, &errors);
        if (DEBUG(MAKE)) {
            debug_printf("done: errors %d\n", errors);
            if (errors)