Module Name: src
Committed By: rillig
Date: Sat Nov 28 10:09:28 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): rename local variable in ModifyWord_Root
The name 'dot' conflicted with the global variable from dir.c when make
was compiled in all-in-one mode.
To generate a diff of this commit:
cvs rdiff -u -r1.697 -r1.698 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.697 src/usr.bin/make/var.c:1.698
--- src/usr.bin/make/var.c:1.697 Sat Nov 28 10:07:26 2020
+++ src/usr.bin/make/var.c Sat Nov 28 10:09:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.697 2020/11/28 10:07:26 rillig Exp $ */
+/* $NetBSD: var.c,v 1.698 2020/11/28 10:09:28 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.697 2020/11/28 10:07:26 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.698 2020/11/28 10:09:28 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -1136,8 +1136,8 @@ ModifyWord_Suffix(const char *word, SepB
static void
ModifyWord_Root(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
{
- const char *dot = strrchr(word, '.');
- size_t len = dot != NULL ? (size_t)(dot - word) : strlen(word);
+ const char *lastDot = strrchr(word, '.');
+ size_t len = lastDot != NULL ? (size_t)(lastDot - word) : strlen(word);
SepBuf_AddBytes(buf, word, len);
}
