[PATCH 2/2] grep/pcre2: factor out literal variable
- From
René Scharfe <l.s.r@web.de>
- Date
- Dec 18, 2021, 19:53 UTC
- Message-ID
- <ba503995-866d-fc80-4e38-b4dfd0e5c5bc@web.de>
- In-Reply-To
- <5fa6962e-3c1c-6dbc-f6d7-589151a9baec@web.de>
Patterns that contain no wildcards and don't have to be case-folded are literal. Give this condition a name to increase the readability of the boolean expression for enabling the option PCRE2_UTF.
Signed-off-by: René Scharfe <l.s.r@web.de> --- grep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grep.c b/grep.c index 5badb6d851..2b6ac3205d 100644 --- a/grep.c +++ b/grep.c @@ -362,6 +362,7 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt int jitret; int patinforet; size_t jitsizearg; + int literal = !opt->ignore_case && (p->fixed || p->is_fixed); /* * Call pcre2_general_context_create() before calling any @@ -382,8 +383,7 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt } options |= PCRE2_CASELESS; } - if (!opt->ignore_locale && is_utf8_locale() && - !(!opt->ignore_case && (p->fixed || p->is_fixed))) + if (!opt->ignore_locale && is_utf8_locale() && !literal) options |= (PCRE2_UTF | PCRE2_MATCH_INVALID_UTF); #ifdef GIT_PCRE2_VERSION_10_36_OR_HIGHER -- 2.34.0