 @@ -1,14 +1,14 @@
-/*	$NetBSD: suff.c,v 1.116 2020/08/26 22:55:46 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.117 2020/08/26 23:08:26 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.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * 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.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.116 2020/08/26 22:55:46 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.117 2020/08/26 23:08:26 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.116 2020/08/26 22:55:46 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.117 2020/08/26 23:08:26 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * suff.c --
  *	Functions to maintain suffix lists and find implicit dependents
  *	using suffix transformation rules
+ *
  * Interface:
  *	Suff_Init 	    	Initialize all things to do with suffixes.
+ *
  *	Suff_End 	    	Cleanup the module
 @@ -517,26 +517,44 @@ SuffInsert(Lst l, Suff *s)
 	Lst_AppendS(s->ref, l);
     } else if (s2->sNum != s->sNum) {
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "before %s(%d)\n", s2->name, s2->sNum);
+	}
 	Lst_InsertBeforeS(l, ln, s);
 	s->refCount++;
 	Lst_AppendS(s->ref, l);
     } else if (DEBUG(SUFF)) {
 	fprintf(debug_file, "already there\n");
+    }
+}
 static Suff *
 SuffNew(const char *name)
+{
     Suff *s = bmake_malloc(sizeof(Suff));
     s->name =   	bmake_strdup(name);
     s->nameLen = 	strlen(s->name);
     s->searchPath = Lst_Init();
     s->children = 	Lst_Init();
     s->parents = 	Lst_Init();
     s->ref = 	Lst_Init();
     s->sNum =   	sNum++;
     s->flags =  	0;
     s->refCount =	1;
     return s;
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_ClearSuffixes --
  *	This is gross. Nuke the list of suffixes but keep all transformation
  *	rules around. The transformation graph is destroyed in this process,
  *	but we leave the list of rules so when a new graph is formed the rules
  *	will remain.
  *	This function is called from the parse module when a
  *	.SUFFIXES:\n line is encountered.
+ *
  * Results:
  *	none
+ *
 @@ -544,38 +562,30 @@ SuffInsert(Lst l, Suff *s)
  *	the sufflist and its graph nodes are destroyed
  *-----------------------------------------------------------------------
  */
 void
 Suff_ClearSuffixes(void)
+{
 #ifdef CLEANUP
     Lst_MoveAllS(suffClean, sufflist);
 #endif
     sufflist = Lst_Init();
     sNum = 0;
     if (suffNull)
 	SuffFree(suffNull);
-    emptySuff = suffNull = bmake_malloc(sizeof(Suff));
+    emptySuff = suffNull = SuffNew("");
     suffNull->name =   	    bmake_strdup("");
     suffNull->nameLen =     0;
     suffNull->searchPath =  Lst_Init();
     Dir_Concat(suffNull->searchPath, dirSearchPath);
     suffNull->children =    Lst_Init();
     suffNull->parents =	    Lst_Init();
     suffNull->ref =	    Lst_Init();
     suffNull->sNum =   	    sNum++;
     suffNull->flags =  	    SUFF_NULL;
     suffNull->refCount =    1;
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffParseTransform --
  *	Parse a transformation string to find its two component suffixes.
+ *
  * Input:
  *	str		String being parsed
  *	srcPtr		Place to store source of trans.
  *	targPtr		Place to store target of trans.
+ *
  * Results:
 @@ -968,37 +978,27 @@ SuffScanTargets(void *targetp, void *gsp
  *	The mainNode passed can be modified if a target mutated into a
  *	transform and that target happened to be the main target.
  *-----------------------------------------------------------------------
  */
 void
 Suff_AddSuffix(char *str, GNode **gn)
+{
     Suff          *s;	    /* new suffix descriptor */
     LstNode 	  ln;
     GNodeSuff	  gs;
     ln = Lst_FindS(sufflist, SuffSuffHasNameP, str);
     if (ln == NULL) {
-	s = bmake_malloc(sizeof(Suff));
+        s = SuffNew(str);
 	s->name =   	bmake_strdup(str);
 	s->nameLen = 	strlen(s->name);
 	s->searchPath = Lst_Init();
 	s->children = 	Lst_Init();
 	s->parents = 	Lst_Init();
 	s->ref = 	Lst_Init();
 	s->sNum =   	sNum++;
 	s->flags =  	0;
 	s->refCount =	1;
 	Lst_AppendS(sufflist, s);
 	/*
 	 * We also look at our existing targets list to see if adding
 	 * this suffix will make one of our current targets mutate into
 	 * a suffix rule. This is ugly, but other makes treat all targets
 	 * that start with a . as suffix rules.
 	 */
 	gs.gn = gn;
 	gs.s  = s;
 	gs.r  = FALSE;
 	Lst_ForEach(Targ_List(), SuffScanTargets, &gs);
 	/*