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): rename SuffScanTargets to SuffUpdateTa...



details:   https://anonhg.NetBSD.org/src/rev/097d2581051a
branches:  trunk
changeset: 978387:097d2581051a
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Nov 21 08:23:36 2020 +0000

description:
make(1): rename SuffScanTargets to SuffUpdateTarget

The word "scan" no longer applies to this function since that is done by
SuffUpdateTargets instead.

diffstat:

 usr.bin/make/suff.c                     |  8 ++++----
 usr.bin/make/unit-tests/suff-rebuild.mk |  4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 467db5d3a765 -r 097d2581051a usr.bin/make/suff.c
--- a/usr.bin/make/suff.c       Sat Nov 21 08:10:27 2020 +0000
+++ b/usr.bin/make/suff.c       Sat Nov 21 08:23:36 2020 +0000
@@ -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 @@
  *     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 @@
     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;
     }
 }
diff -r 467db5d3a765 -r 097d2581051a usr.bin/make/unit-tests/suff-rebuild.mk
--- a/usr.bin/make/unit-tests/suff-rebuild.mk   Sat Nov 21 08:10:27 2020 +0000
+++ b/usr.bin/make/unit-tests/suff-rebuild.mk   Sat Nov 21 08:23:36 2020 +0000
@@ -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 @@
 .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.
 #



Home | Main Index | Thread Index | Old Index