Module Name: src
Committed By: rillig
Date: Fri Jul 31 13:39:15 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): reduce scope of local variables in ApplyModifier_Regex
To generate a diff of this commit:
cvs rdiff -u -r1.360 -r1.361 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.360 src/usr.bin/make/var.c:1.361
--- src/usr.bin/make/var.c:1.360 Fri Jul 31 13:30:09 2020
+++ src/usr.bin/make/var.c Fri Jul 31 13:39:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.360 2020/07/31 13:30:09 rillig Exp $ */
+/* $NetBSD: var.c,v 1.361 2020/07/31 13:39:15 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.360 2020/07/31 13:30:09 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.361 2020/07/31 13:39:15 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.360 2020/07/31 13:30:09 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.361 2020/07/31 13:39:15 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -2463,10 +2463,6 @@ ApplyModifier_Subst(const char * const m
static ApplyModifierResult
ApplyModifier_Regex(const char *mod, ApplyModifiersState *st)
{
- ModifyWord_SubstRegexArgs args;
-
- args.pflags = 0;
- Boolean oneBigWord = st->oneBigWord;
char delim = mod[1];
if (delim == '\0') {
Error("Missing delimiter for :C modifier");
@@ -2483,6 +2479,7 @@ ApplyModifier_Regex(const char *mod, App
return AMR_CLEANUP;
}
+ ModifyWord_SubstRegexArgs args;
args.replace = ParseModifierPart(&st->next, delim, st->eflags, st->ctxt,
NULL, NULL, NULL);
if (args.replace == NULL) {
@@ -2491,6 +2488,8 @@ ApplyModifier_Regex(const char *mod, App
return AMR_CLEANUP;
}
+ args.pflags = 0;
+ Boolean oneBigWord = st->oneBigWord;
for (;; st->next++) {
switch (*st->next) {
case 'g':
