[src/trunk]: src/usr.bin/make make(1): use symbolic names in debug output of ...

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

details:   https://anonhg.NetBSD.org/src/rev/a3a0c2aabde6
branches:  trunk
changeset: 946030:a3a0c2aabde6
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Nov 14 14:57:05 2020 +0000

description:
make(1): use symbolic names in debug output of GNodes

diffstat:

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

diffs (49 lines):

diff -r 98eefa6da453 -r a3a0c2aabde6 usr.bin/make/make.c
--- a/usr.bin/make/make.c       Sat Nov 14 14:16:01 2020 +0000
+++ b/usr.bin/make/make.c       Sat Nov 14 14:57:05 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.c,v 1.203 2020/11/08 11:37:46 rillig Exp $        */
+/*     $NetBSD: make.c,v 1.204 2020/11/14 14:57:05 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -108,7 +108,7 @@
 #include "job.h"
 
 /*     "@(#)make.c     8.1 (Berkeley) 6/6/93"  */
-MAKE_RCSID("$NetBSD: make.c,v 1.203 2020/11/08 11:37:46 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.204 2020/11/14 14:57:05 rillig Exp $");
 
 /* Sequence # to detect recursion. */
 static unsigned int checked = 1;
@@ -648,11 +648,11 @@
     for (ln = parents->first; ln != NULL; ln = ln->next) {
        GNode *pgn = ln->datum;
 
-       if (DEBUG(MAKE))
-           debug_printf("inspect parent %s%s: flags %x, "
-                        "type %x, made %d, unmade %d ",
-                        pgn->name, pgn->cohort_num, pgn->flags,
-                        pgn->type, pgn->made, pgn->unmade - 1);
+       if (DEBUG(MAKE)) {
+           debug_printf("inspect parent %s%s: ", pgn->name, pgn->cohort_num);
+           GNode_FprintDetails(opts.debug_file, "", pgn, "");
+           debug_printf("unmade %d ", pgn->unmade - 1);
+       }
 
        if (!(pgn->flags & REMAKE)) {
            /* This parent isn't needed */
@@ -855,8 +855,11 @@
 {
     GNode *cn = v_cn;
 
-    DEBUG4(MAKE, "MakeBuildChild: inspect %s%s, made %d, type %x\n",
-          cn->name, cn->cohort_num, cn->made, cn->type);
+    if (DEBUG(MAKE)) {
+       debug_printf("MakeBuildChild: inspect %s%s, ",
+              cn->name, cn->cohort_num);
+       GNode_FprintDetails(opts.debug_file, "", cn, "\n");
+    }
     if (cn->made > DEFERRED)
        return 0;