[src/trunk]: src/usr.bin/make make(1): add more details to DEBUG_SRC log

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

details:   https://anonhg.NetBSD.org/src/rev/2a18c080ad1a
branches:  trunk
changeset: 1015548:2a18c080ad1a
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Oct 25 17:12:51 2020 +0000

description:
make(1): add more details to DEBUG_SRC log

diffstat:

 usr.bin/make/suff.c |  21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diffs (84 lines):

diff -r 2b6d4a071f62 -r 2a18c080ad1a usr.bin/make/suff.c
--- a/usr.bin/make/suff.c       Sun Oct 25 17:01:05 2020 +0000
+++ b/usr.bin/make/suff.c       Sun Oct 25 17:12:51 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: suff.c,v 1.223 2020/10/25 10:00:20 rillig Exp $        */
+/*     $NetBSD: suff.c,v 1.224 2020/10/25 17:12:51 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -129,7 +129,7 @@
 #include "dir.h"
 
 /*     "@(#)suff.c     8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.223 2020/10/25 10:00:20 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.224 2020/10/25 17:12:51 rillig Exp $");
 
 #define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
 #define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -875,7 +875,8 @@
     Lst_Append(srcList, s2);
 #ifdef DEBUG_SRC
     Lst_Append(targ->childrenList, s2);
-    debug_printf("%s add %p %p to %p:", debug_tag, targ, s2, srcList);
+    debug_printf("%s add suff %p src %p to list %p:",
+                debug_tag, targ, s2, srcList);
     SrcList_PrintAddrs(srcList);
 #endif
 }
@@ -927,7 +928,7 @@
     SrcListNode *ln;
 
 #ifdef DEBUG_SRC
-    debug_printf("cleaning %p:", l);
+    debug_printf("cleaning list %p:", l);
     SrcList_PrintAddrs(l);
 #endif
 
@@ -947,7 +948,8 @@
                s->parent->children--;
            }
 #ifdef DEBUG_SRC
-           debug_printf("free: [l=%p] p=%p %d\n", l, s, s->children);
+           debug_printf("free: list %p src %p children %d\n",
+                        l, s, s->children);
            Lst_Free(s->childrenList);
 #endif
            Lst_Remove(l, ln);
@@ -956,7 +958,8 @@
        }
 #ifdef DEBUG_SRC
        else {
-           debug_printf("keep: [l=%p] p=%p %d:", l, s, s->children);
+           debug_printf("keep: list %p src %p children %d:",
+                        l, s, s->children);
            SrcList_PrintAddrs(s->childrenList);
        }
 #endif
@@ -989,7 +992,7 @@
         */
        if (Targ_FindNode(src->file) != NULL) {
 #ifdef DEBUG_SRC
-           debug_printf("remove %p from %p\n", src, srcs);
+           debug_printf("remove from list %p src %p\n", srcs, src);
 #endif
            retsrc = src;
            break;
@@ -1000,7 +1003,7 @@
            if (file != NULL) {
                retsrc = src;
 #ifdef DEBUG_SRC
-               debug_printf("remove %p from %p\n", src, srcs);
+               debug_printf("remove from list %p src %p\n", srcs, src);
 #endif
                free(file);
                break;
@@ -1099,7 +1102,7 @@
     suff->refCount++;
     targ->children++;
 #ifdef DEBUG_SRC
-    debug_printf("3 add %p %p\n", targ, ret);
+    debug_printf("3 add targ %p ret %p\n", targ, ret);
     Lst_Append(targ->childrenList, ret);
 #endif
     Lst_Append(slst, ret);