 @@ -1,14 +1,14 @@
-/*	$NetBSD: suff.c,v 1.223 2020/10/25 10:00:20 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.224 2020/10/25 17:12:51 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.
 @@ -119,27 +119,27 @@
  *	Suff_FindDeps	Find implicit sources for and the location of
  *			a target based on its suffix. Returns the
  *			bottom-most node added to the graph or NULL
  *			if the target had no implicit sources.
+ *
  *	Suff_FindPath	Return the appropriate path to search in order to
  *			find the node.
  */
 #include "make.h"
 #include "dir.h"
 /*	"@(#)suff.c	8.4 (Berkeley) 3/21/94"	*/
-MAKE_RCSID("$NetBSD: suff.c,v 1.223 2020/10/25 10:00:20 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.224 2020/10/25 17:12:51 rillig Exp $");
 #define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
 #define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
 #define SUFF_DEBUG2(fmt, arg1, arg2) DEBUG2(SUFF, fmt, arg1, arg2)
 #define SUFF_DEBUG3(fmt, arg1, arg2, arg3) DEBUG3(SUFF, fmt, arg1, arg2, arg3)
 #define SUFF_DEBUG4(fmt, arg1, arg2, arg3, arg4) \
 	DEBUG4(SUFF, fmt, arg1, arg2, arg3, arg4)
 typedef List SuffList;
 typedef ListNode SuffListNode;
 typedef List SrcList;
 typedef ListNode SrcListNode;
 @@ -865,27 +865,28 @@ SrcNew(char *name, char *pref, Suff *suf
     return src;
+}
 static void
 SuffAddSrc(Suff *suff, SrcList *srcList, Src *targ, char *srcName,
 	   const char *debug_tag)
+{
     Src *s2 = SrcNew(srcName, targ->pref, suff, targ, NULL);
     suff->refCount++;
     targ->children++;
     Lst_Append(srcList, s2);
 #ifdef DEBUG_SRC
     Lst_Append(targ->childrenList, s2);
-    debug_printf("%s add %p %p to %p:", debug_tag, targ, s2, srcList);
+    debug_printf("%s add suff %p src %p to list %p:",
 		 debug_tag, targ, s2, srcList);
     SrcList_PrintAddrs(srcList);
 #endif
+}
 /* Add a suffix as a Src structure to the given list with its parent
  * being the given Src structure. If the suffix is the null suffix,
  * the prefix is used unaltered as the file name in the Src structure.
+ *
  * Input:
  *	suff		suffix for which to create a Src structure
  *	srcList		list for the new Src
  *	targ		parent for the new Src
  */
 @@ -917,56 +918,58 @@ SuffAddLevel(SrcList *l, Src *targ)
 	Suff *childSuff = ln->datum;
 	SuffAddSources(childSuff, l, targ);
+    }
+}
 /* Free the first Src in the list that is not referenced anymore.
  * Return whether a Src was removed. */
 static Boolean
 SuffRemoveSrc(SrcList *l)
+{
     SrcListNode *ln;
 #ifdef DEBUG_SRC
-    debug_printf("cleaning %p:", l);
+    debug_printf("cleaning list %p:", l);
     SrcList_PrintAddrs(l);
 #endif
     for (ln = l->first; ln != NULL; ln = ln->next) {
 	Src *s = ln->datum;
 	if (s->children == 0) {
 	    free(s->file);
 	    if (s->parent == NULL)
 		free(s->pref);
 	    else {
 #ifdef DEBUG_SRC
 		SrcListNode *ln2 = Lst_FindDatum(s->parent->childrenList, s);
 		if (ln2 != NULL)
 		    Lst_Remove(s->parent->childrenList, ln2);
 #endif
 		s->parent->children--;
+	    }
 #ifdef DEBUG_SRC
-	    debug_printf("free: [l=%p] p=%p %d\n", l, s, s->children);
+	    debug_printf("free: list %p src %p children %d\n",
 			 l, s, s->children);
 	    Lst_Free(s->childrenList);
 #endif
 	    Lst_Remove(l, ln);
 	    free(s);
 	    return TRUE;
+	}
 #ifdef DEBUG_SRC
 	else {
-	    debug_printf("keep: [l=%p] p=%p %d:", l, s, s->children);
+	    debug_printf("keep: list %p src %p children %d:",
 			 l, s, s->children);
 	    SrcList_PrintAddrs(s->childrenList);
+	}
 #endif
+    }
     return FALSE;
+}
 /* Find the first existing file/target in the list srcs.
+ *
  * Input:
  *	srcs		list of Src structures to search through
+ *
 @@ -979,38 +982,38 @@ SuffFindThem(SrcList *srcs, SrcList *sls
     Src *retsrc = NULL;
     while (!Lst_IsEmpty(srcs)) {
 	Src *src = Lst_Dequeue(srcs);
 	SUFF_DEBUG1("\ttrying %s...", src->file);
 	/*
 	 * A file is considered to exist if either a node exists in the
 	 * graph for it or the file actually exists.
 	 */
 	if (Targ_FindNode(src->file) != NULL) {
 #ifdef DEBUG_SRC
-	    debug_printf("remove %p from %p\n", src, srcs);
+	    debug_printf("remove from list %p src %p\n", srcs, src);
 #endif
 	    retsrc = src;
 	    break;
+	}
+	{
 	    char *file = Dir_FindFile(src->file, src->suff->searchPath);
 	    if (file != NULL) {
 		retsrc = src;
 #ifdef DEBUG_SRC
-		debug_printf("remove %p from %p\n", src, srcs);
+		debug_printf("remove from list %p src %p\n", srcs, src);
 #endif
 		free(file);
 		break;
+	    }
+	}
 	SUFF_DEBUG0("not there\n");
 	SuffAddLevel(srcs, src);
 	Lst_Append(slst, src);
+    }
     if (retsrc) {
 @@ -1089,27 +1092,27 @@ SuffFindCmds(Src *targ, SrcList *slst)
     if (gln == NULL)
 	return NULL;
     /*
      * Hot Damn! Create a new Src structure to describe
      * this transformation (making sure to duplicate the
      * source node's name so Suff_FindDeps can free it
      * again (ick)), and return the new structure.
      */
     ret = SrcNew(bmake_strdup(sgn->name), targ->pref, suff, targ, sgn);
     suff->refCount++;
     targ->children++;
 #ifdef DEBUG_SRC
-    debug_printf("3 add %p %p\n", targ, ret);
+    debug_printf("3 add targ %p ret %p\n", targ, ret);
     Lst_Append(targ->childrenList, ret);
 #endif
     Lst_Append(slst, ret);
     SUFF_DEBUG1("\tusing existing source %s\n", sgn->name);
     return ret;
+}
 /* Expand the names of any children of a given node that contain variable
  * expressions or file wildcards into actual targets.
+ *
  * The expanded node is removed from the parent's list of children, and the
  * parent's unmade counter is decremented, but other nodes may be added.
+ *