[src/trunk]: src/usr.bin/make include the variable name in debugging printfs.

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

details:   https://anonhg.NetBSD.org/src/rev/021d36ac030f
branches:  trunk
changeset: 782701:021d36ac030f
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Nov 15 16:42:26 2012 +0000

description:
include the variable name in debugging printfs.

diffstat:

 usr.bin/make/var.c |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (57 lines):

diff -r e8f4371d49ec -r 021d36ac030f usr.bin/make/var.c
--- a/usr.bin/make/var.c        Thu Nov 15 06:14:54 2012 +0000
+++ b/usr.bin/make/var.c        Thu Nov 15 16:42:26 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.171 2012/06/12 19:21:51 joerg Exp $  */
+/*     $NetBSD: var.c,v 1.172 2012/11/15 16:42:26 christos Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.171 2012/06/12 19:21:51 joerg Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.172 2012/11/15 16:42:26 christos Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c      8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.171 2012/06/12 19:21:51 joerg Exp $");
+__RCSID("$NetBSD: var.c,v 1.172 2012/11/15 16:42:26 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -2561,7 +2561,8 @@
        }
     apply_mods:
        if (DEBUG(VAR)) {
-           fprintf(debug_file, "Applying :%c to \"%s\"\n", *tstr, nstr);
+           fprintf(debug_file, "Applying[%s] :%c to \"%s\"\n", v->name,
+               *tstr, nstr);
        }
        newStr = var_Error;
        switch ((modifier = *tstr)) {
@@ -3161,8 +3162,8 @@
                    free(cp2);
                }
                if (DEBUG(VAR))
-                   fprintf(debug_file, "Pattern for [%s] is [%s]\n", nstr,
-                       pattern);
+                   fprintf(debug_file, "Pattern[%s] for [%s] is [%s]\n",
+                       v->name, nstr, pattern);
                if (*tstr == 'M') {
                    newStr = VarModify(ctxt, &parsestate, nstr, VarMatch,
                                       pattern);
@@ -3517,7 +3518,8 @@
            }
        }
        if (DEBUG(VAR)) {
-           fprintf(debug_file, "Result of :%c is \"%s\"\n", modifier, newStr);
+           fprintf(debug_file, "Result[%s] of :%c is \"%s\"\n",
+               v->name, modifier, newStr);
        }
 
        if (newStr != nstr) {