CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Thu Aug 27 06:31:46 UTC 2020

Modified Files:
        src/usr.bin/make: job.c make.c

Log Message:
make(1): migrate Lst_ForEachFrom to Lst_ForEachFromS


To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/usr.bin/make/job.c
cvs rdiff -u -r1.124 -r1.125 src/usr.bin/make/make.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.215 src/usr.bin/make/job.c:1.216
--- src/usr.bin/make/job.c:1.215	Sun Aug 23 18:26:35 2020
+++ src/usr.bin/make/job.c	Thu Aug 27 06:31:46 2020
@@ -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 @@ JobFinish(Job *job, int status)
 	 * 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 @@ JobStart(GNode *gn, int flags)
 	 */
 	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);

Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.124 src/usr.bin/make/make.c:1.125
--- src/usr.bin/make/make.c:1.124	Wed Aug 26 22:55:46 2020
+++ src/usr.bin/make/make.c	Thu Aug 27 06:31:46 2020
@@ -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 @@ Make_ProcessWait(Lst targs)
 	    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);