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): improve local variable name in ParseVa...
details: https://anonhg.NetBSD.org/src/rev/3776c306de95
branches: trunk
changeset: 945641:3776c306de95
user: rillig <rillig%NetBSD.org@localhost>
date: Mon Nov 02 21:24:23 2020 +0000
description:
make(1): improve local variable name in ParseVarname
diffstat:
usr.bin/make/var.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diffs (44 lines):
diff -r 3dff2632c263 -r 3776c306de95 usr.bin/make/var.c
--- a/usr.bin/make/var.c Mon Nov 02 21:15:00 2020 +0000
+++ b/usr.bin/make/var.c Mon Nov 02 21:24:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.650 2020/11/02 21:15:00 rillig Exp $ */
+/* $NetBSD: var.c,v 1.651 2020/11/02 21:24:23 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.650 2020/11/02 21:15:00 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.651 2020/11/02 21:24:23 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -3437,6 +3437,7 @@
return st.val;
bad_modifier:
+ /* XXX: The modifier end is only guessed. */
Error("Bad modifier `:%.*s' for %s",
(int)strcspn(mod, ":)}"), mod, st.v->name);
@@ -3527,12 +3528,12 @@
/* A variable inside a variable, expand. */
if (*p == '$') {
- void *freeIt;
- const char *rval;
- (void)Var_Parse(&p, ctxt, eflags, &rval, &freeIt);
+ const char *nested_val;
+ void *nested_val_freeIt;
+ (void)Var_Parse(&p, ctxt, eflags, &nested_val, &nested_val_freeIt);
/* TODO: handle errors */
- Buf_AddStr(&buf, rval);
- free(freeIt);
+ Buf_AddStr(&buf, nested_val);
+ free(nested_val_freeIt);
} else {
Buf_AddByte(&buf, *p);
p++;
Home |
Main Index |
Thread Index |
Old Index