Module Name: src
Committed By: rillig
Date: Wed Oct 21 08:20:13 UTC 2020
Modified Files:
src/usr.bin/make: suff.c
src/usr.bin/make/unit-tests: deptgt-suffixes.exp
Log Message:
make(1): add suffix number to the debug log
Previously, I had taken that lonely number in the debug log for the
sNum, but it was the reference count.
To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 src/usr.bin/make/suff.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/deptgt-suffixes.exp
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/suff.c
diff -u src/usr.bin/make/suff.c:1.211 src/usr.bin/make/suff.c:1.212
--- src/usr.bin/make/suff.c:1.211 Wed Oct 21 08:00:06 2020
+++ src/usr.bin/make/suff.c Wed Oct 21 08:20:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.211 2020/10/21 08:00:06 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.212 2020/10/21 08:20:13 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.211 2020/10/21 08:00:06 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.212 2020/10/21 08:20:13 rillig Exp $");
#define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
#define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -2079,7 +2079,7 @@ PrintSuffNames(const char *prefix, SuffL
static void
PrintSuff(Suff *s)
{
- debug_printf("# `%s' [%d] ", s->name, s->refCount);
+ debug_printf("# \"%s\" (num %d, ref %d)", s->name, s->sNum, s->refCount);
if (s->flags != 0) {
char flags_buf[SuffFlags_ToStringSize];
Index: src/usr.bin/make/unit-tests/deptgt-suffixes.exp
diff -u src/usr.bin/make/unit-tests/deptgt-suffixes.exp:1.2 src/usr.bin/make/unit-tests/deptgt-suffixes.exp:1.3
--- src/usr.bin/make/unit-tests/deptgt-suffixes.exp:1.2 Fri Aug 28 04:07:14 2020
+++ src/usr.bin/make/unit-tests/deptgt-suffixes.exp Wed Oct 21 08:20:13 2020
@@ -1,5 +1,5 @@
#*** Suffixes:
-# `.custom-null' [1] (SUFF_NULL)
+# ".custom-null" (num 1, ref 1) (SUFF_NULL)
# To:
# From:
# Search Path: . ..
