[src/trunk]: src/usr.bin/make make(1): clean up suffix handling

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4229fc8f8ffc
branches:  trunk
changeset: 937904:4229fc8f8ffc
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Aug 28 17:27:21 2020 +0000

description:
make(1): clean up suffix handling

diffstat:

 usr.bin/make/suff.c |  52 ++++++++--------------------------------------------
 1 files changed, 8 insertions(+), 44 deletions(-)

diffs (110 lines):

diff -r bf0098081473 -r 4229fc8f8ffc usr.bin/make/suff.c
--- a/usr.bin/make/suff.c       Fri Aug 28 17:21:02 2020 +0000
+++ b/usr.bin/make/suff.c       Fri Aug 28 17:27:21 2020 +0000
@@ -1,4 +1,4 @@
-/*     $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
@@ -69,14 +69,14 @@
  */
 
 #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
@@ -2432,22 +2432,13 @@
 }
 
 
-/*
- * Input:
- *     gn              node we're dealing with
- *
- */
 static void
 SuffFindDeps(GNode *gn, Lst slst)
 {
-    if (gn->type & OP_DEPS_FOUND) {
-       /*
-        * If dependencies already found, no need to do it again...
-        */
+    if (gn->type & OP_DEPS_FOUND)
        return;
-    } else {
-       gn->type |= OP_DEPS_FOUND;
-    }
+    gn->type |= OP_DEPS_FOUND;
+
     /*
      * Make sure we have these set, may get revised below.
      */
@@ -2502,16 +2493,12 @@
  * 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
@@ -2537,18 +2524,7 @@
     }
 }
 
-/*-
- *-----------------------------------------------------------------------
- * Suff_Init --
- *     Initialize suffixes module
- *
- * Results:
- *     None
- *
- * Side Effects:
- *     Many
- *-----------------------------------------------------------------------
- */
+/* Initialize the suffixes module. */
 void
 Suff_Init(void)
 {
@@ -2568,19 +2544,7 @@
 }
 
 
-/*-
- *----------------------------------------------------------------------
- * Suff_End --
- *     Cleanup the this module
- *
- * Results:
- *     None
- *
- * Side Effects:
- *     The memory is free'd.
- *----------------------------------------------------------------------
- */
-
+/* Clean up the suffixes module. */
 void
 Suff_End(void)
 {