Module Name: src
Committed By: rillig
Date: Sat Oct 31 18:05:16 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): fix local variable names in ParseModifierPart
To generate a diff of this commit:
cvs rdiff -u -r1.626 -r1.627 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.626 src/usr.bin/make/var.c:1.627
--- src/usr.bin/make/var.c:1.626 Sat Oct 31 15:23:52 2020
+++ src/usr.bin/make/var.c Sat Oct 31 18:05:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.626 2020/10/31 15:23:52 rillig Exp $ */
+/* $NetBSD: var.c,v 1.627 2020/10/31 18:05:16 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -129,7 +129,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.626 2020/10/31 15:23:52 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.627 2020/10/31 18:05:16 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -1955,15 +1955,15 @@ ParseModifierPart(
* and suck it in without further ado.
* It will be interpreted later.
*/
- char have = p[1];
- int want = have == '(' ? ')' : '}';
+ char startc = p[1];
+ int endc = startc == '(' ? ')' : '}';
int depth = 1;
for (p += 2; *p != '\0' && depth > 0; p++) {
if (p[-1] != '\\') {
- if (*p == have)
+ if (*p == startc)
depth++;
- if (*p == want)
+ if (*p == endc)
depth--;
}
}
