 @@ -1,14 +1,14 @@
-/*	$NetBSD: suff.c,v 1.273 2020/11/21 20:04:10 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.274 2020/11/21 20:12:08 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.
 @@ -104,27 +104,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.273 2020/11/21 20:04:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.274 2020/11/21 20:12:08 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)
 typedef List SuffixList;
 typedef ListNode SuffixListNode;
 typedef List SrcList;
 typedef ListNode SrcListNode;
 static SuffixList *sufflist;	/* List of suffixes */
 #ifdef CLEANUP
 @@ -202,27 +202,26 @@ typedef struct Src {
     SrcList *childrenList;
 #endif
 } Src;
 /* TODO: Document the difference between nullSuff and emptySuff. */
 /* The NULL suffix for this run */
 static Suffix *nullSuff;
 /* The empty suffix required for POSIX single-suffix transformation rules */
 static Suffix *emptySuff;
 static void SuffFindDeps(GNode *, SrcList *);
 static void SuffExpandWildcards(GNodeListNode *, GNode *);
 static Suffix *
 Suffix_Ref(Suffix *suff)
+{
     suff->refCount++;
     return suff;
+}
 /* Change the value of a Suffix variable, adjusting the reference counts. */
 static void
 Suffix_Reassign(Suffix **var, Suffix *suff)
+{
     if (*var != NULL)
 @@ -1114,26 +1113,70 @@ SuffFindCmds(Src *targ, SrcList *slst)
      * again (ick)), and return the new structure.
      */
     ret = SrcNew(bmake_strdup(sgn->name), targ->pref, suff, targ, sgn);
     targ->numChildren++;
 #ifdef DEBUG_SRC
     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;
+}
 static void
 SuffExpandWildcards(GNodeListNode *cln, GNode *pgn)
+{
     GNode *cgn = cln->datum;
     StringList *expansions;
     if (!Dir_HasWildcards(cgn->name))
 	return;
     /*
      * Expand the word along the chosen path
      */
     expansions = Lst_New();
     Dir_Expand(cgn->name, Suff_FindPath(cgn), expansions);
     while (!Lst_IsEmpty(expansions)) {
 	GNode	*gn;
 	/*
 	 * Fetch next expansion off the list and find its GNode
 	 */
 	char *cp = Lst_Dequeue(expansions);
 	SUFF_DEBUG1("%s...", cp);
 	gn = Targ_GetNode(cp);
 	/* Add gn to the parents child list before the original child */
 	Lst_InsertBefore(pgn->children, cln, gn);
 	Lst_Append(gn->parents, pgn);
 	pgn->unmade++;
+    }
     Lst_Free(expansions);
     SUFF_DEBUG0("\n");
     /*
      * Now the source is expanded, remove it from the list of children to
      * keep it from being processed.
      */
     pgn->unmade--;
     Lst_Remove(pgn->children, cln);
     Lst_Remove(cgn->parents, Lst_FindDatum(cgn->parents, pgn));
+}
 /* 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.
+ *
  * Input:
  *	cln		Child to examine
  *	pgn		Parent node being processed
  */
 static void
 SuffExpandChildren(GNodeListNode *cln, GNode *pgn)
+{
 @@ -1269,70 +1312,26 @@ SuffExpandChildren(GNodeListNode *cln, G
+    }
     SUFF_DEBUG0("\n");
     /*
      * Now the source is expanded, remove it from the list of children to
      * keep it from being processed.
      */
     pgn->unmade--;
     Lst_Remove(pgn->children, cln);
     Lst_Remove(cgn->parents, Lst_FindDatum(cgn->parents, pgn));
+}
 static void
 SuffExpandWildcards(GNodeListNode *cln, GNode *pgn)
     GNode *cgn = cln->datum;
     StringList *expansions;
     if (!Dir_HasWildcards(cgn->name))
 	return;
     /*
      * Expand the word along the chosen path
      */
     expansions = Lst_New();
     Dir_Expand(cgn->name, Suff_FindPath(cgn), expansions);
     while (!Lst_IsEmpty(expansions)) {
 	GNode	*gn;
 	/*
 	 * Fetch next expansion off the list and find its GNode
 	 */
 	char *cp = Lst_Dequeue(expansions);
 	SUFF_DEBUG1("%s...", cp);
 	gn = Targ_GetNode(cp);
 	/* Add gn to the parents child list before the original child */
 	Lst_InsertBefore(pgn->children, cln, gn);
 	Lst_Append(gn->parents, pgn);
 	pgn->unmade++;
     Lst_Free(expansions);
     SUFF_DEBUG0("\n");
     /*
      * Now the source is expanded, remove it from the list of children to
      * keep it from being processed.
      */
     pgn->unmade--;
     Lst_Remove(pgn->children, cln);
     Lst_Remove(cgn->parents, Lst_FindDatum(cgn->parents, pgn));
 /* Find a path along which to expand the node.
+ *
  * If the node has a known suffix, use that path.
  * If it has no known suffix, use the default system search path.
+ *
  * Input:
  *	gn		Node being examined
+ *
  * Results:
  *	The appropriate path to search for the GNode.
  */
 SearchPath *
 Suff_FindPath(GNode* gn)