 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.330 2020/09/25 23:39:51 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.331 2020/09/26 00:03:29 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -121,27 +121,27 @@
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
 #ifndef MAP_COPY
 #define MAP_COPY MAP_PRIVATE
 #endif
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.330 2020/09/25 23:39:51 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.331 2020/09/26 00:03:29 rillig Exp $");
 /* types and constants */
 /*
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
     char      	    *fname;         /* name of file */
     Boolean         fromForLoop;    /* simulated .include by the .for loop */
     int             lineno;         /* current line number in file */
     int             first_lineno;   /* line number of start of text */
     int             cond_depth;     /* 'if' nesting when file opened */
     Boolean         depending;      /* state of doing_depend on EOF */
 @@ -783,50 +783,48 @@ ParseMessage(char *line)
 struct ParseLinkSrcArgs {
     GNode *cgn;
     /* The special target of the current dependency line. */
     /* Example: for ".END: action", it is 'End'. */
     ParseSpecial specType;
 };
 /* Add the child to the parent's children.
+ *
  * Add the parent to the child's parents, but only if the target is not
  * special.  An example for such a special target is .END, which does not
  * need to be informed once the child target has been made. */
-static int
+static void
 ParseLinkSrc(void *pgnp, void *data)
+{
     const struct ParseLinkSrcArgs *args = data;
     GNode *pgn = pgnp;
     GNode *cgn = args->cgn;
     if ((pgn->type & OP_DOUBLEDEP) && !Lst_IsEmpty(pgn->cohorts))
 	pgn = LstNode_Datum(Lst_Last(pgn->cohorts));
     Lst_Append(pgn->children, cgn);
     pgn->unmade += 1;
     if (args->specType == Not)
 	Lst_Append(cgn->parents, pgn);
     if (DEBUG(PARSE)) {
 	fprintf(debug_file, "# %s: added child %s - %s\n",
 		__func__, pgn->name, cgn->name);
 	Targ_PrintNode(pgn, 0);
 	Targ_PrintNode(cgn, 0);
+    }
     return 0;
+}
 /*-
  *---------------------------------------------------------------------
  * ParseDoOp  --
  *	Apply the parsed operator to the given target node. Used in a
  *	Lst_ForEachUntil call by ParseDoDependency once all targets have
  *	been found and their operator parsed. If the previous and new
  *	operators are incompatible, a major error is taken.
+ *
  * Input:
  *	gnp		The node to which the operator is to be applied
  *	opp		The operator to apply
 @@ -944,27 +942,27 @@ ParseDoSrc(int tOp, const char *src, Par
 		 * have happened, it is given a dependency on the each
 		 * previous child back to and previous .WAIT node.
 		 * The next child won't be scheduled until the .WAIT node
 		 * is built.
 		 * We give each .WAIT node a unique name (mainly for diag).
 		 */
 		snprintf(wait_src, sizeof wait_src, ".WAIT_%u", ++wait_number);
 		gn = Targ_FindNode(wait_src, TARG_NOHASH);
 		if (doing_depend)
 		    ParseMark(gn);
 		gn->type = OP_WAIT | OP_PHONY | OP_DEPENDS | OP_NOTMAIN;
 		if (targets != NULL) {
 		    struct ParseLinkSrcArgs args = { gn, specType };
-		    Lst_ForEachUntil(targets, ParseLinkSrc, &args);
+		    Lst_ForEach(targets, ParseLinkSrc, &args);
+		}
 		return;
+	    }
+	}
+    }
     switch (specType) {
     case Main:
 	/*
 	 * If we have noted the existence of a .MAIN, it means we need
 	 * to add the sources of said target to the list of things
 	 * to create. The string 'src' is likely to be free, so we
 	 * must make a new copy of it. Note that this will only be
 @@ -1015,27 +1013,27 @@ ParseDoSrc(int tOp, const char *src, Par
 	 * the 'cohorts' list of the node) or all the cohorts are linked
 	 * to all the targets.
 	 */
 	/* Find/create the 'src' node and attach to all targets */
 	gn = Targ_FindNode(src, TARG_CREATE);
 	if (doing_depend)
 	    ParseMark(gn);
 	if (tOp) {
 	    gn->type |= tOp;
 	} else {
 	    if (targets != NULL) {
 	        struct ParseLinkSrcArgs args = { gn, specType };
-		Lst_ForEachUntil(targets, ParseLinkSrc, &args);
+		Lst_ForEach(targets, ParseLinkSrc, &args);
+	    }
+	}
 	break;
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * ParseFindMain --
  *	Find a real target in the list and set it to be the main one.
  *	Called by ParseDoDependency when a main target hasn't been found
  *	yet.
+ *
 @@ -1053,64 +1051,36 @@ ParseDoSrc(int tOp, const char *src, Par
 static int
 ParseFindMain(void *gnp, void *dummy MAKE_ATTR_UNUSED)
+{
     GNode   	  *gn = (GNode *)gnp;
     if (!(gn->type & OP_NOTARGET)) {
 	mainNode = gn;
 	Targ_SetMain(gn);
 	return 1;
     } else {
 	return 0;
+    }
+}
-/*-
+static void
  *-----------------------------------------------------------------------
  * ParseAddDir --
  *	Front-end for Dir_AddDir to make sure Lst_ForEachUntil keeps going
  * Results:
  *	=== 0
  * Side Effects:
  *	See Dir_AddDir.
  *-----------------------------------------------------------------------
  */
 static int
 ParseAddDir(void *path, void *name)
+{
     (void)Dir_AddDir(path, name);
     return 0;
+}
-/*-
+static void
- *-----------------------------------------------------------------------
+ParseClearPath(void *path, void *unused MAKE_ATTR_UNUSED)
  * ParseClearPath --
  *	Front-end for Dir_ClearPath to make sure Lst_ForEachUntil keeps going
  * Results:
  *	=== 0
  * Side Effects:
  *	See Dir_ClearPath
  *-----------------------------------------------------------------------
  */
 static int
 ParseClearPath(void *path, void *dummy MAKE_ATTR_UNUSED)
+{
     Dir_ClearPath(path);
     return 0;
+}
 /*
  * We got to the end of the line while we were still looking at targets.
+ *
  * Ending a dependency line without an operator is a Bozo no-no.  As a
  * heuristic, this is also often triggered by undetected conflicts from
  * cvs/rcs merges.
  */
 static void
 ParseErrorNoDependency(const char *lstart, const char *line)
+{
     if ((strncmp(line, "<<<<<<", 6) == 0) ||
 @@ -1551,27 +1521,27 @@ ParseDoDependency(char *line)
 		Suff_ClearSuffixes();
 		break;
 	    case Precious:
 		allPrecious = TRUE;
 		break;
 	    case Ignore:
 		ignoreErrors = TRUE;
 		break;
 	    case Silent:
 		beSilent = TRUE;
 		break;
 	    case ExPath:
 		if (paths != NULL)
-		    Lst_ForEachUntil(paths, ParseClearPath, NULL);
+		    Lst_ForEach(paths, ParseClearPath, NULL);
 		Dir_SetPATH();
 		break;
 #ifdef POSIX
 	    case Posix:
 		Var_Set("%POSIX", "1003.2", VAR_GLOBAL);
 		break;
 #endif
 	    default:
 		break;
+	}
     } else if (specType == MFlags) {
 	/*
 	 * Call on functions in main.c to deal with these arguments and
 @@ -1627,27 +1597,27 @@ ParseDoDependency(char *line)
 	     * and will cause make to do a new chdir to that path.
 	     */
 	    while (*cp && !ch_isspace(*cp)) {
 		cp++;
+	    }
 	    savec = *cp;
 	    *cp = '\0';
 	    switch (specType) {
 		case Suffixes:
 		    Suff_AddSuffix(line, &mainNode);
 		    break;
 		case ExPath:
 		    if (paths != NULL)
-			Lst_ForEachUntil(paths, ParseAddDir, line);
+			Lst_ForEach(paths, ParseAddDir, line);
 		    break;
 		case Includes:
 		    Suff_AddInclude(line);
 		    break;
 		case Libs:
 		    Suff_AddLib(line);
 		    break;
 		case Null:
 		    Suff_SetNull(line);
 		    break;
 		case ExObjdir:
 		    Main_SetObjdir("%s", line);
 		    break;
 @@ -2826,38 +2796,37 @@ ParseReadLine(void)
 			     "Unexpected end of file in for loop.");
 		    break;
+		}
 	    } while (For_Accum(line));
 	    /* Stash each iteration as a new 'input file' */
 	    For_Run(lineno);
 	    /* Read next line from for-loop buffer */
 	    continue;
+	}
 	return line;
+    }
+}
-static int
+static void
 SuffEndTransform(void *target, void *unused MAKE_ATTR_UNUSED)
+{
     Suff_EndTransform(target);
     return 0;
+}
 static void
 FinishDependencyGroup(void)
+{
     if (targets != NULL) {
-	Lst_ForEachUntil(targets, SuffEndTransform, NULL);
+	Lst_ForEach(targets, SuffEndTransform, NULL);
 	Lst_Destroy(targets, ParseHasCommands);
+    }
     targets = NULL;
+}
 /* Add the command to each target from the current dependency spec. */
 static void
 ParseLine_ShellCommand(char *cp)
+{
     for (; ch_isspace(*cp); cp++)
 	continue;
     if (*cp == '\0')