[src/trunk]: src/usr.bin/make make(1): merge duplicate calls to SuffInsert

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

details:   https://anonhg.NetBSD.org/src/rev/c9d12d06ea1e
branches:  trunk
changeset: 946120:c9d12d06ea1e
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Nov 16 23:23:57 2020 +0000

description:
make(1): merge duplicate calls to SuffInsert

diffstat:

 usr.bin/make/suff.c |  30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diffs (86 lines):

diff -r cb33ca7c2c5a -r c9d12d06ea1e usr.bin/make/suff.c
--- a/usr.bin/make/suff.c       Mon Nov 16 22:31:42 2020 +0000
+++ b/usr.bin/make/suff.c       Mon Nov 16 23:23:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: suff.c,v 1.245 2020/11/16 22:31:42 rillig Exp $        */
+/*     $NetBSD: suff.c,v 1.246 2020/11/16 23:23:57 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -114,7 +114,7 @@
 #include "dir.h"
 
 /*     "@(#)suff.c     8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.245 2020/11/16 22:31:42 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.246 2020/11/16 23:23:57 rillig Exp $");
 
 #define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
 #define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -330,7 +330,7 @@
 /* Insert the suffix into the list, keeping the list ordered by suffix
  * number. */
 static void
-SuffInsert(SuffList *list, Suff *suff)
+SuffList_Insert(SuffList *list, Suff *suff)
 {
     SuffListNode *ln;
     Suff *listSuff = NULL;
@@ -358,6 +358,13 @@
     }
 }
 
+static void
+SuffRelate(Suff *srcSuff, Suff *targSuff)
+{
+    SuffList_Insert(targSuff->children, srcSuff);
+    SuffList_Insert(srcSuff->parents, targSuff);
+}
+
 static Suff *
 SuffNew(const char *name)
 {
@@ -514,8 +521,7 @@
      */
     SUFF_DEBUG2("defining transformation from `%s' to `%s'\n",
                srcSuff->name, targSuff->name);
-    SuffInsert(targSuff->children, srcSuff);
-    SuffInsert(srcSuff->parents, targSuff);
+    SuffRelate(srcSuff, targSuff);
 
     return gn;
 }
@@ -588,8 +594,7 @@
        Suff *to = FindSuffByName(toName);
        if (to != NULL) {
            /* Link in and return, since it can't be anything else. */
-           SuffInsert(to->children, suff);
-           SuffInsert(suff->parents, to);
+           SuffRelate(suff, to);
            return;
        }
     }
@@ -600,12 +605,8 @@
     toName = SuffSuffGetSuffix(suff, nameLen, name + nameLen);
     if (toName != NULL) {
        Suff *from = FindSuffByNameLen(name, (size_t)(toName - name));
-
-       if (from != NULL) {
-           /* establish the proper relationship */
-           SuffInsert(suff->children, from);
-           SuffInsert(from->parents, suff);
-       }
+       if (from != NULL)
+           SuffRelate(from, suff);
     }
 }
 
@@ -652,8 +653,7 @@
         */
        SUFF_DEBUG2("defining transformation from `%s' to `%s'\n",
                    srcSuff->name, targSuff->name);
-       SuffInsert(targSuff->children, srcSuff);
-       SuffInsert(srcSuff->parents, targSuff);
+       SuffRelate(srcSuff, targSuff);
     }
     return FALSE;
 }