Module Name: src
Committed By: rillig
Date: Sat Dec 19 13:30:00 UTC 2020
Modified Files:
src/usr.bin/make: parse.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.496 -r1.497 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.496 src/usr.bin/make/parse.c:1.497
--- src/usr.bin/make/parse.c:1.496 Sat Dec 19 13:16:25 2020
+++ src/usr.bin/make/parse.c Sat Dec 19 13:30:00 2020
@@ -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 @@ Parse_SetInput(const char *name, int lin
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 */
