Module Name: src
Committed By: rillig
Date: Sat Nov 21 08:23:36 UTC 2020
Modified Files:
src/usr.bin/make: suff.c
src/usr.bin/make/unit-tests: suff-rebuild.mk
Log Message:
make(1): rename SuffScanTargets to SuffUpdateTarget
The word "scan" no longer applies to this function since that is done by
SuffUpdateTargets instead.
To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.252 src/usr.bin/make/suff.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/suff-rebuild.mk
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.251 src/usr.bin/make/suff.c:1.252
--- src/usr.bin/make/suff.c:1.251 Sat Nov 21 08:01:20 2020
+++ src/usr.bin/make/suff.c Sat Nov 21 08:23:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.251 2020/11/21 08:01:20 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.252 2020/11/21 08:23:36 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -114,7 +114,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.251 2020/11/21 08:01:20 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.252 2020/11/21 08:23:36 rillig Exp $");
#define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
#define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -627,7 +627,7 @@ SuffRebuildGraph(GNode *transform, Suff
* TRUE iff a new main target has been selected.
*/
static Boolean
-SuffScanTargets(GNode *target, GNode **inout_main, Suff *suff, Boolean *r)
+SuffUpdateTarget(GNode *target, GNode **inout_main, Suff *suff, Boolean *r)
{
Suff *srcSuff, *targSuff;
char *ptr;
@@ -676,7 +676,7 @@ UpdateTargets(GNode **inout_main, Suff *
GNodeListNode *ln;
for (ln = Targ_List()->first; ln != NULL; ln = ln->next) {
GNode *gn = ln->datum;
- if (SuffScanTargets(gn, inout_main, s, &r))
+ if (SuffUpdateTarget(gn, inout_main, s, &r))
break;
}
}
Index: src/usr.bin/make/unit-tests/suff-rebuild.mk
diff -u src/usr.bin/make/unit-tests/suff-rebuild.mk:1.2 src/usr.bin/make/unit-tests/suff-rebuild.mk:1.3
--- src/usr.bin/make/unit-tests/suff-rebuild.mk:1.2 Sun Oct 18 16:12:39 2020
+++ src/usr.bin/make/unit-tests/suff-rebuild.mk Sat Nov 21 08:23:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: suff-rebuild.mk,v 1.2 2020/10/18 16:12:39 rillig Exp $
+# $NetBSD: suff-rebuild.mk,v 1.3 2020/11/21 08:23:36 rillig Exp $
#
# Demonstrates what happens to transformation rules (called inference rules
# by POSIX) when all suffixes are deleted.
@@ -19,7 +19,7 @@ suff-rebuild-example.a:
.c:
: from c to nothing
-# XXX: At a quick glance, the code in SuffScanTargets looks as if it were
+# XXX: At a quick glance, the code in SuffUpdateTarget looks as if it were
# possible to delete the suffixes in the middle of the makefile, add back
# the suffixes from before, and have the transformation rules preserved.
#
