Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make make(1): reduce debugging details in Parse_SetI...



details:   https://anonhg.NetBSD.org/src/rev/40a3d40e59cf
branches:  trunk
changeset: 947604:40a3d40e59cf
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Dec 19 13:30:00 2020 +0000

description:
make(1): reduce debugging details in Parse_SetInput

The address of readMoreArg is hardly useful when stepping through this
part of the code, therefore omit it.  Instead of mentioning the exact
function names of the data source, describe them in words, which helps
especially in the case of .for loops.

diffstat:

 usr.bin/make/parse.c |  14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diffs (35 lines):

diff -r 75e29426ff73 -r 40a3d40e59cf usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Sat Dec 19 13:20:17 2020 +0000
+++ b/usr.bin/make/parse.c      Sat Dec 19 13:30:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.496 2020/12/19 13:16:25 rillig Exp $       */
+/*     $NetBSD: parse.c,v 1.497 2020/12/19 13:30:00 rillig Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -117,7 +117,7 @@
 #include "pathnames.h"
 
 /*     "@(#)parse.c    8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.496 2020/12/19 13:16:25 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.497 2020/12/19 13:30:00 rillig Exp $");
 
 /* types and constants */
 
@@ -2442,13 +2442,9 @@
        else
                ParseTrackInput(name);
 
-       if (DEBUG(PARSE)) {
-               const char *caller = readMore == loadedfile_readMore
-                   ? "loadedfile" : "other";
-               debug_printf(
-                   "%s: file %s, line %d, fd %d, readMore %s, readMoreArg %p\n",
-                   __func__, name, lineno, fd, caller, readMoreArg);
-       }
+       DEBUG3(PARSE, "Parse_SetInput: %s %s, line %d\n",
+           readMore == loadedfile_readMore ? "file" : ".for loop in",
+           name, lineno);
 
        if (fd == -1 && readMore == NULL)
                /* sanity */



Home | Main Index | Thread Index | Old Index