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 local variable in FindCmds



details:   https://anonhg.NetBSD.org/src/rev/17763cf556d3
branches:  trunk
changeset: 958856:17763cf556d3
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Jan 23 12:35:22 2021 +0000

description:
make(1): rename local variable in FindCmds

diffstat:

 usr.bin/make/suff.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r 87638f877024 -r 17763cf556d3 usr.bin/make/suff.c
--- a/usr.bin/make/suff.c       Sat Jan 23 12:34:19 2021 +0000
+++ b/usr.bin/make/suff.c       Sat Jan 23 12:35:22 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: suff.c,v 1.338 2021/01/23 12:25:35 rillig Exp $        */
+/*     $NetBSD: suff.c,v 1.339 2021/01/23 12:35:22 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.338 2021/01/23 12:25:35 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.339 2021/01/23 12:35:22 rillig Exp $");
 
 typedef List SuffixList;
 typedef ListNode SuffixListNode;
@@ -1183,7 +1183,7 @@
        prefLen = strlen(targ->prefix);
 
        for (gln = tgn->children.first; gln != NULL; gln = gln->next) {
-               const char *cp;
+               const char *base;
 
                sgn = gln->datum;
 
@@ -1198,11 +1198,11 @@
                        continue;
                }
 
-               cp = str_basename(sgn->name);
-               if (strncmp(cp, targ->prefix, prefLen) != 0)
+               base = str_basename(sgn->name);
+               if (strncmp(base, targ->prefix, prefLen) != 0)
                        continue;
                /* The node matches the prefix, see if it has a known suffix. */
-               suff = FindSuffixByName(cp + prefLen);
+               suff = FindSuffixByName(base + prefLen);
                if (suff == NULL)
                        continue;
 



Home | Main Index | Thread Index | Old Index