diff mbox series

[01/10] grep/pcre2: drop needless assignment + assert() on opt->pcre2

Message ID 20210204210556.25242-2-avarab@gmail.com (mailing list archive)
State Accepted
Commit 0ddf8ceac0b38c1ec89551c08dc49cb4b96c82bc
Headers show
Series grep/pcre2: memory allocation fixes | expand

Commit Message

Ævar Arnfjörð Bjarmason Feb. 4, 2021, 9:05 p.m. UTC
Drop an assignment added in b65abcafc7a (grep: use PCRE v2 for
optimized fixed-string search, 2019-07-01) and the overly cautious
assert() I added in 94da9193a6e (grep: add support for PCRE v2,

There was never a good reason for this, it's just a relic from when I
initially wrote the PCREv2 support. We're not going to have confusion
about compile_pcre2_pattern() being called when it shouldn't just
because we forgot to cargo-cult this opt->pcre2 option, and "opt"
is (mostly) used for the options the user supplied, let's avoid the
pattern of needlessly assigning to it.

With my in-flight removal of PCREv1 [1] ("Remove support for v1 of the
PCRE library", 2021-01-24) there'll be even less confusion around what
we call where in these codepaths, which is one more reason to remove

1. https://lore.kernel.org/git/xmqqmtwy29x8.fsf@gitster.c.googlers.com/

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
 grep.c | 3 ---
 1 file changed, 3 deletions(-)
diff mbox series


diff --git a/grep.c b/grep.c
index aabfaaa4c3..816e23f17e 100644
--- a/grep.c
+++ b/grep.c
@@ -373,8 +373,6 @@  static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
 	int patinforet;
 	size_t jitsizearg;
-	assert(opt->pcre2);
 	p->pcre2_compile_context = NULL;
 	/* pcre2_global_context is initialized in append_grep_pattern */
@@ -555,7 +553,6 @@  static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
 	if (p->fixed || p->is_fixed) {
 #ifdef USE_LIBPCRE2
-		opt->pcre2 = 1;
 		if (p->is_fixed) {
 			compile_pcre2_pattern(p, opt);
 		} else {