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 ModifyWord_Su...
details: https://anonhg.NetBSD.org/src/rev/34f8e4a7e6e2
branches: trunk
changeset: 946445:34f8e4a7e6e2
user: rillig <rillig%NetBSD.org@localhost>
date: Sat Nov 28 10:07:26 2020 +0000
description:
make(1): rename local variable in ModifyWord_Suffix
It conflicted with 'dot' from dir.c.
diffstat:
usr.bin/make/var.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diffs (31 lines):
diff -r 3d6eae4f0b55 -r 34f8e4a7e6e2 usr.bin/make/var.c
--- a/usr.bin/make/var.c Sat Nov 28 10:05:49 2020 +0000
+++ b/usr.bin/make/var.c Sat Nov 28 10:07:26 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.696 2020/11/24 21:42:28 rillig Exp $ */
+/* $NetBSD: var.c,v 1.697 2020/11/28 10:07:26 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.696 2020/11/24 21:42:28 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.697 2020/11/28 10:07:26 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -1126,9 +1126,9 @@
static void
ModifyWord_Suffix(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
{
- const char *dot = strrchr(word, '.');
- if (dot != NULL)
- SepBuf_AddStr(buf, dot + 1);
+ const char *lastDot = strrchr(word, '.');
+ if (lastDot != NULL)
+ SepBuf_AddStr(buf, lastDot + 1);
}
/* Callback for ModifyWords to implement the :R modifier.
Home |
Main Index |
Thread Index |
Old Index