Module Name: src
Committed By: rillig
Date: Sat Nov 28 10:07:26 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): rename local variable in ModifyWord_Suffix
It conflicted with 'dot' from dir.c.
To generate a diff of this commit:
cvs rdiff -u -r1.696 -r1.697 src/usr.bin/make/var.c
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/var.c
diff -u src/usr.bin/make/var.c:1.696 src/usr.bin/make/var.c:1.697
--- src/usr.bin/make/var.c:1.696 Tue Nov 24 21:42:28 2020
+++ src/usr.bin/make/var.c Sat Nov 28 10:07:26 2020
@@ -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 @@ ModifyWord_Tail(const char *word, SepBuf
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.
