 @@ -1,14 +1,14 @@
-/*	$NetBSD: arch.c,v 1.215 2024/02/07 06:43:02 rillig Exp $	*/
+/*	$NetBSD: arch.c,v 1.216 2024/04/27 17:33:46 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.
 @@ -116,54 +116,53 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <ar.h>
 #include <utime.h>
 #include "make.h"
 #include "dir.h"
 #include "config.h"
 /*	"@(#)arch.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: arch.c,v 1.215 2024/02/07 06:43:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.216 2024/04/27 17:33:46 rillig Exp $");
 typedef struct List ArchList;
 typedef struct ListNode ArchListNode;
 static ArchList archives;	/* The archives we've already examined */
 typedef struct Arch {
 	char *name;		/* Name of archive */
 	HashTable members;	/* All the members of the archive described
 				 * by <name, struct ar_hdr *> key/value pairs */
 	char *fnametab;		/* Extended name table strings */
 	size_t fnamesize;	/* Size of the string table */
 } Arch;
 static FILE *ArchFindMember(const char *, const char *,
 			    struct ar_hdr *, const char *);
 #if defined(__svr4__) || defined(__SVR4) || defined(__ELF__)
 #define SVR4ARCHIVES
 static int ArchSVR4Entry(Arch *, char *, size_t, FILE *);
 #endif
 #ifdef CLEANUP
 static void
-ArchFree(void *ap)
+ArchFree(Arch *a)
+{
 	Arch *a = ap;
 	HashIter hi;
 	/* Free memory from hash entries */
 	HashIter_Init(&hi, &a->members);
 	while (HashIter_Next(&hi) != NULL)
 		free(hi.entry->value);
 	free(a->name);
 	free(a->fnametab);
 	HashTable_Done(&a->members);
 	free(a);
+}
 #endif
 @@ -1060,27 +1059,31 @@ Arch_LibOODate(GNode *gn)
 /* Initialize the archives module. */
 void
 Arch_Init(void)
+{
 	Lst_Init(&archives);
+}
 /* Clean up the archives module. */
 void
 Arch_End(void)
+{
 #ifdef CLEANUP
-	Lst_DoneCall(&archives, ArchFree);
+	ArchListNode *ln;
 	for (ln = archives.first; ln != NULL; ln = ln->next)
 		ArchFree(ln->datum);
 	Lst_Done(&archives);
 #endif
+}
 bool
 Arch_IsLib(GNode *gn)
+{
 	static const char armag[] = "!<arch>\n";
 	char buf[sizeof armag - 1];
 	int fd;
 	if ((fd = open(gn->path, O_RDONLY)) == -1)
 		return false;

 @@ -1,14 +1,14 @@
-/* $NetBSD: lst.c,v 1.107 2023/12/29 20:43:58 rillig Exp $ */
+/* $NetBSD: lst.c,v 1.108 2024/04/27 17:33:46 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.
 @@ -24,59 +24,59 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "make.h"
-MAKE_RCSID("$NetBSD: lst.c,v 1.107 2023/12/29 20:43:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: lst.c,v 1.108 2024/04/27 17:33:46 rillig Exp $");
 static ListNode *
 LstNodeNew(ListNode *prev, ListNode *next, void *datum)
+{
 	ListNode *ln = bmake_malloc(sizeof *ln);
 	ln->prev = prev;
 	ln->next = next;
 	ln->datum = datum;
 	return ln;
+}
 void
 Lst_Done(List *list)
+{
 	ListNode *ln, *next;
 	for (ln = list->first; ln != NULL; ln = next) {
 		next = ln->next;
 		free(ln);
+	}
+}
 void
-Lst_DoneCall(List *list, LstFreeProc freeProc)
+Lst_DoneFree(List *list)
+{
 	ListNode *ln, *next;
 	for (ln = list->first; ln != NULL; ln = next) {
 		next = ln->next;
-		freeProc(ln->datum);
+		free(ln->datum);
 		free(ln);
+	}
+}
 /* Insert a new node with the datum before the given node. */
 void
 Lst_InsertBefore(List *list, ListNode *ln, void *datum)
+{
 	ListNode *newNode;
 	assert(datum != NULL);
 	newNode = LstNodeNew(ln->prev, ln, datum);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lst.h,v 1.104 2023/12/29 20:43:58 rillig Exp $	*/
+/*	$NetBSD: lst.h,v 1.105 2024/04/27 17:33:46 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 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.
 @@ -88,33 +88,30 @@ typedef struct List List;
 typedef struct ListNode ListNode;
 struct ListNode {
 	ListNode *prev;		/* previous node in list, or NULL */
 	ListNode *next;		/* next node in list, or NULL */
 	void *datum;		/* datum associated with this element */
 };
 struct List {
 	ListNode *first;
 	ListNode *last;
 };
-/* Free the datum of a node, called before freeing the node itself. */
+/* Free the list nodes. */
 typedef void LstFreeProc(void *);
 /* Free the list nodes, but not the list itself. */
 void Lst_Done(List *);
-/* Free the list nodes, freeing the node data using the given function. */
+/* Free the list nodes, as well as each node's datum. */
-void Lst_DoneCall(List *, LstFreeProc);
+void Lst_DoneFree(List *);
 #define LST_INIT { NULL, NULL }
 /* Initialize a list, without memory allocation. */
 MAKE_INLINE void
 Lst_Init(List *list)
+{
 	list->first = NULL;
 	list->last = NULL;
+}
 /* Get information about a list */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.612 2024/03/10 02:53:37 sjg Exp $	*/
+/*	$NetBSD: main.c,v 1.613 2024/04/27 17:33:46 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.
 @@ -101,27 +101,27 @@
 #include <errno.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 #include "trace.h"
 /*	"@(#)main.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: main.c,v 1.612 2024/03/10 02:53:37 sjg Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.613 2024/04/27 17:33:46 rillig Exp $");
 #if defined(MAKE_NATIVE)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
 	    "The Regents of the University of California.  "
 	    "All rights reserved.");
 #endif
 CmdOpts opts;
 time_t now;			/* Time at start of make */
 GNode *defaultNode;		/* .DEFAULT node */
 bool allPrecious;		/* .PRECIOUS given on a line by itself */
 bool deleteOnError;		/* .DELETE_ON_ERROR: set */
 static int maxJobTokens;	/* -j argument */
 @@ -1189,27 +1189,27 @@ ReadBuiltinRules(void)
 	    _PATH_DEFSYSMK,
 	    &sysMkFiles);
 	if (Lst_IsEmpty(&sysMkFiles))
 		Fatal("%s: no system rules (%s).", progname, _PATH_DEFSYSMK);
 	for (ln = sysMkFiles.first; ln != NULL; ln = ln->next)
 		if (ReadMakefile(ln->datum))
 			break;
 	if (ln == NULL)
 		Fatal("%s: cannot open %s.",
 		    progname, (const char *)sysMkFiles.first->datum);
-	Lst_DoneCall(&sysMkFiles, free);
+	Lst_DoneFree(&sysMkFiles);
+}
 static void
 InitMaxJobs(void)
+{
 	char *value;
 	int n;
 	if (forceJobs || opts.compatMake ||
 	    !Var_Exists(SCOPE_GLOBAL, ".MAKE.JOBS"))
 		return;
 	value = Var_Subst("${.MAKE.JOBS}", SCOPE_GLOBAL, VARE_WANTRES);
 @@ -1554,29 +1554,29 @@ main_Run(void)
 		/* print the values of any variables requested by the user */
 		doPrintVars();
 		return false;
 	} else {
 		return runTargets();
+	}
+}
 /* Clean up after making the targets. */
 static void
 main_CleanUp(void)
+{
 #ifdef CLEANUP
-	Lst_DoneCall(&opts.variables, free);
+	Lst_DoneFree(&opts.variables);
-	Lst_DoneCall(&opts.makefiles, free);
+	Lst_DoneFree(&opts.makefiles);
-	Lst_DoneCall(&opts.create, free);
+	Lst_DoneFree(&opts.create);
 #endif
 	if (DEBUG(GRAPH2))
 		Targ_PrintGraph(2);
 	Trace_Log(MAKEEND, NULL);
 	if (enterFlagObj)
 		printf("%s: Leaving directory `%s'\n", progname, objdir);
 	if (opts.enterFlag)
 		printf("%s: Leaving directory `%s'\n", progname, curdir);
 #ifdef USE_META

 @@ -1,14 +1,14 @@
-/*      $NetBSD: meta.c,v 1.207 2023/12/17 09:02:26 rillig Exp $ */
+/*      $NetBSD: meta.c,v 1.208 2024/04/27 17:33:46 rillig Exp $ */
 /*
  * Implement 'meta' mode.
  * Adapted from John Birrell's patches to FreeBSD make.
  * --sjg
  */
 /*
  * Copyright (c) 2009-2016, Juniper Networks, Inc.
  * Portions Copyright (c) 2009, John Birrell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -1585,27 +1585,27 @@ meta_oodate(GNode *gn, bool oodate)
 		(cp > gn->path)) {
 		if (strncmp(curdir, gn->path, (size_t)(cp - gn->path)) != 0) {
 		    cp = NULL;		/* not in .CURDIR */
+		}
+	    }
 	    if (cp == NULL) {
 		DEBUG1(META, "%s: required but missing\n", fname);
 		oodate = true;
 		needOODATE = true;	/* assume the worst */
+	    }
+	}
+    }
-    Lst_DoneCall(&missingFiles, free);
+    Lst_DoneFree(&missingFiles);
     if (oodate && needOODATE) {
 	/*
 	 * Target uses .OODATE which is empty; or we wouldn't be here.
 	 * We have decided it is oodate, so .OODATE needs to be set.
 	 * All we can sanely do is set it to .ALLSRC.
 	 */
 	Var_Delete(gn, OODATE);
 	Var_Set(gn, OODATE, GNode_VarAllsrc(gn));
+    }
  oodate_out:
     FStr_Done(&dname);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.721 2024/04/23 22:51:28 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.722 2024/04/27 17:33:46 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.
 @@ -95,27 +95,27 @@
  */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stdarg.h>
 #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.721 2024/04/23 22:51:28 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.722 2024/04/27 17:33:46 rillig Exp $");
 /* Detects a multiple-inclusion guard in a makefile. */
 typedef enum {
 	GS_START,		/* at the beginning of the file */
 	GS_COND,		/* after the guard condition */
 	GS_DONE,		/* after the closing .endif */
 	GS_NO			/* the file is not guarded */
 } GuardState;
 /* A file being parsed. */
 typedef struct IncludedFile {
 	FStr name;		/* absolute or relative to the cwd */
 	unsigned lineno;	/* 1-based */
 @@ -2956,27 +2956,27 @@ Parse_Init(void)
 	sysIncPath = SearchPath_New();
 	defSysIncPath = SearchPath_New();
 	Vector_Init(&includes, sizeof(IncludedFile));
 	HashTable_Init(&guards);
+}
 /* Clean up the parsing module. */
 void
 Parse_End(void)
+{
 #ifdef CLEANUP
 	HashIter hi;
-	Lst_DoneCall(&targCmds, free);
+	Lst_DoneFree(&targCmds);
 	assert(targets == NULL);
 	SearchPath_Free(defSysIncPath);
 	SearchPath_Free(sysIncPath);
 	SearchPath_Free(parseIncPath);
 	assert(includes.len == 0);
 	Vector_Done(&includes);
 	HashIter_Init(&hi, &guards);
 	while (HashIter_Next(&hi) != NULL) {
 		Guard *guard = hi.entry->value;
 		free(guard->name);
 		free(guard);
+	}
 	HashTable_Done(&guards);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: targ.c,v 1.180 2024/03/10 02:53:37 sjg Exp $	*/
+/*	$NetBSD: targ.c,v 1.181 2024/04/27 17:33:47 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.
 @@ -97,55 +97,60 @@
+ *
  * Debugging:
  *	Targ_PrintGraph
  *			Print out the entire graph, all variables and
  *			statistics for the directory cache.
  */
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 /*	"@(#)targ.c	8.2 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: targ.c,v 1.180 2024/03/10 02:53:37 sjg Exp $");
+MAKE_RCSID("$NetBSD: targ.c,v 1.181 2024/04/27 17:33:47 rillig Exp $");
 /*
  * All target nodes that appeared on the left-hand side of one of the
  * dependency operators ':', '::', '!'.
  */
 static GNodeList allTargets = LST_INIT;
 static HashTable allTargetsByName;
 #ifdef CLEANUP
 static GNodeList allNodes = LST_INIT;
-static void GNode_Free(void *);
+static void GNode_Free(GNode *);
 #endif
 void
 Targ_Init(void)
+{
 	HashTable_Init(&allTargetsByName);
+}
 void
 Targ_End(void)
+{
 #ifdef CLEANUP
 	GNodeListNode *ln;
 #endif
 	Targ_Stats();
 #ifdef CLEANUP
 	Lst_Done(&allTargets);
 	HashTable_Done(&allTargetsByName);
-	Lst_DoneCall(&allNodes, GNode_Free);
+	for (ln = allNodes.first; ln != NULL; ln = ln->next)
 		GNode_Free(ln->datum);
 	Lst_Done(&allNodes);
 #endif
+}
 void
 Targ_Stats(void)
+{
 	HashTable_DebugStats(&allTargetsByName, "targets");
+}
 /*
  * Return the list of all targets, which are all nodes that appear on the
  * left-hand side of a dependency declaration such as "target: source".
  * The returned list does not contain pure sources.
 @@ -202,30 +207,28 @@ GNode_New(const char *name)
 	gn->fname = NULL;
 	gn->lineno = 0;
 	gn->exit_status = 0;
 #ifdef CLEANUP
 	Lst_Append(&allNodes, gn);
 #endif
 	return gn;
+}
 #ifdef CLEANUP
 static void
-GNode_Free(void *gnp)
+GNode_Free(GNode *gn)
+{
 	GNode *gn = gnp;
 	free(gn->name);
 	free(gn->uname);
 	free(gn->path);
 	/* Don't free gn->youngestChild since it is not owned by this node. */
 	/*
 	 * In the following lists, only free the list nodes, but not the
 	 * GNodes in them since these are not owned by this node.
 	 */
 	Lst_Done(&gn->implicitParents);
 	Lst_Done(&gn->parents);
 	Lst_Done(&gn->children);