Module Name: src Committed By: rillig Date: Mon Jul 27 23:04:18 UTC 2020
Modified Files: src/usr.bin/make: var.c Log Message: make(1): in ApplyModifier_Match, use short local variable name To generate a diff of this commit: cvs rdiff -u -r1.346 -r1.347 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.346 src/usr.bin/make/var.c:1.347 --- src/usr.bin/make/var.c:1.346 Mon Jul 27 22:59:49 2020 +++ src/usr.bin/make/var.c Mon Jul 27 23:04:18 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.346 2020/07/27 22:59:49 rillig Exp $ */ +/* $NetBSD: var.c,v 1.347 2020/07/27 23:04:18 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: var.c,v 1.346 2020/07/27 22:59:49 rillig Exp $"; +static char rcsid[] = "$NetBSD: var.c,v 1.347 2020/07/27 23:04: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.346 2020/07/27 22:59:49 rillig Exp $"); +__RCSID("$NetBSD: var.c,v 1.347 2020/07/27 23:04:18 rillig Exp $"); #endif #endif /* not lint */ #endif @@ -2325,34 +2325,33 @@ ApplyModifier_Match(const char *mod, App * XXX This will likely not work right if $() and ${} are intermixed. */ int nest = 1; - for (st->cp = mod + 1; - *st->cp != '\0' && !(*st->cp == ':' && nest == 1); - st->cp++) { - if (*st->cp == '\\' && - (st->cp[1] == ':' || st->cp[1] == st->endc || - st->cp[1] == st->startc)) { + const char *p; + for (p = mod + 1; *p != '\0' && !(*p == ':' && nest == 1); p++) { + if (*p == '\\' && + (p[1] == ':' || p[1] == st->endc || p[1] == st->startc)) { if (!needSubst) copy = TRUE; - st->cp++; + p++; continue; } - if (*st->cp == '$') + if (*p == '$') needSubst = TRUE; - if (*st->cp == '(' || *st->cp == '{') + if (*p == '(' || *p == '{') ++nest; - if (*st->cp == ')' || *st->cp == '}') { + if (*p == ')' || *p == '}') { --nest; if (nest == 0) break; } } + st->cp = p; st->termc = *st->cp; const char *endpat = st->cp; char *pattern; if (copy) { /* Compress the \:'s out of the pattern. */ - pattern = bmake_malloc(st->cp - (mod + 1) + 1); + pattern = bmake_malloc(endpat - (mod + 1) + 1); char *dst = pattern; const char *src = mod + 1; for (; src < endpat; src++, dst++) {