 @@ -1,14 +1,14 @@
-/*	$NetBSD: suff.c,v 1.126 2020/08/28 06:37:21 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.127 2020/08/28 17:27:21 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.126 2020/08/28 06:37:21 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.127 2020/08/28 17:27:21 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.126 2020/08/28 06:37:21 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.127 2020/08/28 17:27:21 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
 @@ -2422,42 +2422,33 @@ sfnd_return:
  *-----------------------------------------------------------------------
  */
 void
 Suff_FindDeps(GNode *gn)
+{
     SuffFindDeps(gn, srclist);
     while (SuffRemoveSrc(srclist))
 	continue;
+}
 /*
  * Input:
  *	gn		node we're dealing with
  */
 static void
 SuffFindDeps(GNode *gn, Lst slst)
+{
-    if (gn->type & OP_DEPS_FOUND) {
+    if (gn->type & OP_DEPS_FOUND)
 	/*
 	 * If dependencies already found, no need to do it again...
 	 */
 	return;
-    } else {
+    gn->type |= OP_DEPS_FOUND;
 	gn->type |= OP_DEPS_FOUND;
     /*
      * Make sure we have these set, may get revised below.
      */
     Var_Set(TARGET, gn->path ? gn->path : gn->name, gn);
     Var_Set(PREFIX, gn->name, gn);
     if (DEBUG(SUFF)) {
 	fprintf(debug_file, "SuffFindDeps (%s)\n", gn->name);
+    }
     if (gn->type & OP_ARCHV) {
 	SuffFindArchiveDeps(gn, slst);
     } else if (gn->type & OP_LIB) {
 @@ -2492,105 +2483,78 @@ SuffFindDeps(GNode *gn, Lst slst)
     } else {
 	SuffFindNormalDeps(gn, slst);
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_SetNull --
  *	Define which suffix is the null suffix.
+ *
  * Input:
  *	name		Name of null suffix
+ *
  * Results:
  *	None.
  * Side Effects:
  *	'suffNull' is altered.
+ *
  * Notes:
  *	Need to handle the changing of the null suffix gracefully so the
  *	old transformation rules don't just go away.
  *-----------------------------------------------------------------------
  */
 void
 Suff_SetNull(char *name)
+{
     Suff    *s;
     LstNode ln;
     ln = Lst_Find(sufflist, SuffSuffHasNameP, name);
     if (ln != NULL) {
 	s = Lst_Datum(ln);
 	if (suffNull != NULL) {
 	    suffNull->flags &= ~SUFF_NULL;
+	}
 	s->flags |= SUFF_NULL;
 	/*
 	 * XXX: Here's where the transformation mangling would take place
 	 */
 	suffNull = s;
     } else {
 	Parse_Error(PARSE_WARNING, "Desired null suffix %s not defined.",
 		     name);
+    }
+}
-/*-
+/* Initialize the suffixes module. */
  *-----------------------------------------------------------------------
  * Suff_Init --
  *	Initialize suffixes module
  * Results:
  *	None
  * Side Effects:
  *	Many
  *-----------------------------------------------------------------------
  */
 void
 Suff_Init(void)
+{
 #ifdef CLEANUP
     suffClean = Lst_Init();
     sufflist = Lst_Init();
 #endif
     srclist = Lst_Init();
     transforms = Lst_Init();
     /*
      * Create null suffix for single-suffix rules (POSIX). The thing doesn't
      * actually go on the suffix list or everyone will think that's its
      * suffix.
      */
     Suff_ClearSuffixes();
+}
-/*-
+/* Clean up the suffixes module. */
  *----------------------------------------------------------------------
  * Suff_End --
  *	Cleanup the this module
  * Results:
  *	None
  * Side Effects:
  *	The memory is free'd.
  *----------------------------------------------------------------------
  */
 void
 Suff_End(void)
+{
 #ifdef CLEANUP
     Lst_Destroy(sufflist, SuffFree);
     Lst_Destroy(suffClean, SuffFree);
     if (suffNull)
 	SuffFree(suffNull);
     Lst_Free(srclist);
     Lst_Free(transforms);
 #endif
+}