[PATCH v3 3/4] grep/pcre2: further simplify boolean spaghetti
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2021-01-24 02:14:01
Subsystem:
the rest · Maintainer:
Linus Torvalds
Follow-up the last commit by splitting the fixed check for the PCRE2_UTF flag into a variable. Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- grep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grep.c b/grep.c
index 0bb772f727..242b4a3506 100644
--- a/grep.c
+++ b/grep.c@@ -473,6 +473,7 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt int jitret; int patinforet; size_t jitsizearg; + const int fixed = p->fixed || p->is_fixed; assert(opt->pcre2);
@@ -491,7 +492,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() && has_non_ascii(p->pattern) && - (opt->ignore_case || !(p->fixed || p->is_fixed))) + (opt->ignore_case || !fixed)) options |= PCRE2_UTF; p->pcre2_pattern = pcre2_compile((PCRE2_SPTR)p->pattern,
--
2.29.2.222.g5d2a92d10f8