grep: consistently use "p->fixed" in compile_regexp()

At the start of this function we do:

    p->fixed = opt->fixed;

It's less confusing to use that variable consistently that switch back
& forth between the two.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2019-07-26 17:08:14 +02:00 committed by Junio C Hamano
parent 685668faaa
commit 8a35b540a9

2
grep.c
View file

@ -616,7 +616,7 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
die(_("given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2"));
pat_is_fixed = is_fixed(p->pattern, p->patternlen);
if (opt->fixed || pat_is_fixed) {
if (p->fixed || pat_is_fixed) {
#ifdef USE_LIBPCRE2
opt->pcre2 = 1;
if (pat_is_fixed) {