Module Name: src
Committed By: rillig
Date: Sat Dec 12 00:53:23 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): inline local variable in ApplyModifiersIndirect
To generate a diff of this commit:
cvs rdiff -u -r1.721 -r1.722 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.721 src/usr.bin/make/var.c:1.722
--- src/usr.bin/make/var.c:1.721 Sat Dec 12 00:42:35 2020
+++ src/usr.bin/make/var.c Sat Dec 12 00:53:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.721 2020/12/12 00:42:35 rillig Exp $ */
+/* $NetBSD: var.c,v 1.722 2020/12/12 00:53: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.721 2020/12/12 00:42:35 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.722 2020/12/12 00:53:23 rillig Exp $");
/* A string that may need to be freed after use. */
typedef struct FStr {
@@ -3421,12 +3421,11 @@ ApplyModifiersIndirect(ApplyModifiersSta
mods, (int)(p - *pp), *pp);
if (mods[0] != '\0') {
- const char *rval_p = mods;
- st->val = ApplyModifiers(&rval_p, st->val, '\0', '\0',
+ st->val = ApplyModifiers(&mods, st->val, '\0', '\0',
st->var, &st->exprFlags, st->ctxt, st->eflags,
inout_freeIt);
if (st->val == var_Error || st->val == varUndefined ||
- *rval_p != '\0') {
+ *mods != '\0') {
free(mods_freeIt);
*pp = p;
return AMIR_OUT; /* error already reported */
