[src/trunk]: src/usr.bin/make make(1): clean up reference counting for suffixes

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

details:   https://anonhg.NetBSD.org/src/rev/6b3666c14055
branches:  trunk
changeset: 978408:6b3666c14055
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Nov 21 13:11:13 2020 +0000

description:
make(1): clean up reference counting for suffixes

diffstat:

 usr.bin/make/suff.c |  49 +++++++++++++++++++++++++++----------------------
 1 files changed, 27 insertions(+), 22 deletions(-)

diffs (108 lines):

diff -r 1f22f36ed2a6 -r 6b3666c14055 usr.bin/make/suff.c
--- a/usr.bin/make/suff.c       Sat Nov 21 12:26:41 2020 +0000
+++ b/usr.bin/make/suff.c       Sat Nov 21 13:11:13 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: suff.c,v 1.258 2020/11/21 12:01:16 rillig Exp $        */
+/*     $NetBSD: suff.c,v 1.259 2020/11/21 13:11:13 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.258 2020/11/21 12:01:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.259 2020/11/21 13:11:13 rillig Exp $");
 
 #define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
 #define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -203,6 +203,25 @@
 static void SuffFindDeps(GNode *, SrcList *);
 static void SuffExpandWildcards(GNodeListNode *, GNode *);
 
+/* Change the value of a Suff variable, adjusting the reference counts. */
+static void
+SuffReassign(Suff **var, Suff *suff)
+{
+    if (*var != NULL)
+       (*var)->refCount--;
+    *var = suff;
+    suff->refCount++;
+}
+
+/* Set a Suff variable to NULL, adjusting the reference count. */
+static void
+SuffUnassign(Suff **var)
+{
+    if (*var != NULL)
+       (*var)->refCount--;
+    *var = NULL;
+}
+
 /*
  * See if pref is a prefix of str.
  * Return NULL if it ain't, pointer to character in str after prefix if so.
@@ -1612,10 +1631,7 @@
        char savec;
        char *ptr;
 
-       if (gn->suffix)
-           gn->suffix->refCount--;
-       gn->suffix = targ->suff;
-       gn->suffix->refCount++;
+       SuffReassign(&gn->suffix, targ->suff);
 
        savec = gn->path[savep];
        gn->path[savep] = '\0';
@@ -1632,9 +1648,7 @@
        char *ptr;
 
        /* The .PREFIX gets the full path if the target has no known suffix. */
-       if (gn->suffix)
-           gn->suffix->refCount--;
-       gn->suffix = NULL;
+       SuffUnassign(&gn->suffix);
 
        if ((ptr = strrchr(gn->path, '/')) != NULL)
            ptr++;
@@ -1804,10 +1818,7 @@
     for (src = bottom; src->parent != NULL; src = src->parent) {
        targ = src->parent;
 
-       if (src->node->suffix)
-           src->node->suffix->refCount--;
-       src->node->suffix = src->suff;
-       src->node->suffix->refCount++;
+       SuffReassign(&src->node->suffix, src->suff);
 
        if (targ->node == NULL)
            targ->node = Targ_GetNode(targ->file);
@@ -1830,10 +1841,7 @@
        }
     }
 
-    if (gn->suffix != NULL)
-       gn->suffix->refCount--;
-    gn->suffix = src->suff;
-    gn->suffix->refCount++;
+    SuffReassign(&gn->suffix, src->suff);
 
     /*
      * Nuke the transformation path and the Src structures left over in the
@@ -1901,14 +1909,11 @@
         * value).
         */
        Suff *suff = FindSuffByName(LIBSUFF);
-       if (gn->suffix)
-           gn->suffix->refCount--;
        if (suff != NULL) {
-           gn->suffix = suff;
-           gn->suffix->refCount++;
+           SuffReassign(&gn->suffix, suff);
            Arch_FindLib(gn, suff->searchPath);
        } else {
-           gn->suffix = NULL;
+           SuffUnassign(&gn->suffix);
            Var_Set(TARGET, gn->name, gn);
        }
        /*