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(1): migrate Lst_ForEachFrom to Lst_ForEach...



details:   https://anonhg.NetBSD.org/src/rev/e64a2d9f7814
branches:  trunk
changeset: 943126:e64a2d9f7814
user:      rillig <rillig%NetBSD.org@localhost>
date:      Thu Aug 27 06:31:46 2020 +0000

description:
make(1): migrate Lst_ForEachFrom to Lst_ForEachFromS

diffstat:

 usr.bin/make/job.c  |  16 ++++++++--------
 usr.bin/make/make.c |   8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs (86 lines):

diff -r 8c5ae9d60d8f -r e64a2d9f7814 usr.bin/make/job.c
--- a/usr.bin/make/job.c        Thu Aug 27 06:28:44 2020 +0000
+++ b/usr.bin/make/job.c        Thu Aug 27 06:31:46 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.215 2020/08/23 18:26:35 rillig Exp $ */
+/*     $NetBSD: job.c,v 1.216 2020/08/27 06:31:46 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.215 2020/08/23 18:26:35 rillig Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.216 2020/08/27 06:31:46 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)job.c      8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: job.c,v 1.215 2020/08/23 18:26:35 rillig Exp $");
+__RCSID("$NetBSD: job.c,v 1.216 2020/08/27 06:31:46 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1101,9 +1101,9 @@
         * on the .END target.
         */
        if (job->tailCmds != NULL) {
-           Lst_ForEachFrom(job->node->commands, job->tailCmds,
+           Lst_ForEachFromS(job->node->commands, job->tailCmds,
                             JobSaveCommand,
-                           job->node);
+                            job->node);
        }
        job->node->made = MADE;
        if (!(job->flags & JOB_SPECIAL))
@@ -1724,9 +1724,9 @@
         */
        if (cmdsOK && aborting == 0) {
            if (job->tailCmds != NULL) {
-               Lst_ForEachFrom(job->node->commands, job->tailCmds,
-                               JobSaveCommand,
-                              job->node);
+               Lst_ForEachFromS(job->node->commands, job->tailCmds,
+                                JobSaveCommand,
+                                job->node);
            }
            job->node->made = MADE;
            Make_Update(job->node);
diff -r 8c5ae9d60d8f -r e64a2d9f7814 usr.bin/make/make.c
--- a/usr.bin/make/make.c       Thu Aug 27 06:28:44 2020 +0000
+++ b/usr.bin/make/make.c       Thu Aug 27 06:31:46 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.c,v 1.124 2020/08/26 22:55:46 rillig Exp $        */
+/*     $NetBSD: make.c,v 1.125 2020/08/27 06:31:46 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: make.c,v 1.124 2020/08/26 22:55:46 rillig Exp $";
+static char rcsid[] = "$NetBSD: make.c,v 1.125 2020/08/27 06:31:46 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)make.c     8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: make.c,v 1.124 2020/08/26 22:55:46 rillig Exp $");
+__RCSID("$NetBSD: make.c,v 1.125 2020/08/27 06:31:46 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1456,7 +1456,7 @@
            cgn = Lst_DatumS(ln);
            if (cgn->type & OP_WAIT) {
                /* Make the .WAIT node depend on the previous children */
-               Lst_ForEachFrom(pgn->children, owln, add_wait_dep, cgn);
+               Lst_ForEachFromS(pgn->children, owln, add_wait_dep, cgn);
                owln = ln;
            } else {
                Lst_AppendS(examine, cgn);



Home | Main Index | Thread Index | Old Index