Module Name: src
Committed By: rillig
Date: Thu Aug 20 06:48:18 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): consistently access args->pflags in ModifyWord_Subst
It was confusing that some accesses were via pflags and some via
args->pflags.
To generate a diff of this commit:
cvs rdiff -u -r1.450 -r1.451 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.450 src/usr.bin/make/var.c:1.451
--- src/usr.bin/make/var.c:1.450 Thu Aug 20 06:35:14 2020
+++ src/usr.bin/make/var.c Thu Aug 20 06:48:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.450 2020/08/20 06:35:14 rillig Exp $ */
+/* $NetBSD: var.c,v 1.451 2020/08/20 06:48:18 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.450 2020/08/20 06:35:14 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.451 2020/08/20 06:48:18 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.450 2020/08/20 06:35:14 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.451 2020/08/20 06:48:18 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -1278,10 +1278,9 @@ ModifyWord_Subst(const char *word, SepBu
{
size_t wordLen = strlen(word);
ModifyWord_SubstArgs *args = data;
- const VarPatternFlags pflags = args->pflags;
const char *match;
- if ((pflags & VARP_SUB_ONE) && (pflags & VARP_SUB_MATCHED))
+ if ((args->pflags & VARP_SUB_ONE) && (args->pflags & VARP_SUB_MATCHED))
goto nosub;
if (args->pflags & VARP_ANCHOR_START) {
