@matheusbsbs / matheus-bagliano / commits / e0b9f8ae09

grep: remove redundant regflags assignments

Remove redundant assignments to the "regflags" variable. This variable is only used set under GREP_PATTERN_TYPE_ERE, so there's no need to un-set it under GREP_PATTERN_TYPE_{FIXED,BRE,PCRE}. Back in 5010cb5fcc[1], we did do "opt.regflags &= ~REG_EXTENDED" upon seeing "-G" on the command line and flipped the bit on upon seeing "-E", but I think that was perfectly sensible and it would have been a bug if we didn't. They were part of the command line parsing that could have seen "-E" on the command line earlier. When cca2c172 ("git-grep: do not die upon -F/-P when grep.extendedRegexp is set.", 2011-05-09) switched the command line parsing to "read into a 'tentatively this is what we saw the last' variable and then finally commit just once", we didn't touch opt.regflags for PCRE and FIXED, but we still had to flip regflags between BRE and ERE, because parsing of grep.extendedregexp configuration variable directly touched opt.regflags back then, which was done by b22520a3 ("grep: allow -E and -n to be turned on by default via configuration", 2011-03-30). When 84befcd0 ("grep: add a grep.patternType configuration setting", 2012-08-03) introduced extended_regexp_option field, we stopped flipping regflags while reading the configuration, and that was when we should have noticed and stopped dropping REG_EXTENDED bit in the "now we can commit what type to use" helper function. There is no reason to do this anymore, so stop doing it, more to reduce "wait this is used under fixed/BRE/PCRE how?" confusion when reading the code, than to to save ourselves trivial CPU cycles by removing one assignment. 1. "built-in "git grep"", 2006-04-30. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed May 25, 2017 at 19:45 UTC e0b9f8ae09a47b59e0a658d35a3430d9c98fd177

1 file changed +1 -5

grep.c

+1 -5

@@ -179,7 +179,6 @@ static void grep_set_pattern_type_option(enum grep_pattern_type pattern_type, st

179 case GREP_PATTERN_TYPE_BRE:

180 opt->fixed = 0;

181 opt->pcre = 0;

182 - opt->regflags &= ~REG_EXTENDED;

182 break;

183

184 case GREP_PATTERN_TYPE_ERE:

@@ -191,13 +190,11 @@ static void grep_set_pattern_type_option(enum grep_pattern_type pattern_type, st

190 case GREP_PATTERN_TYPE_FIXED:

191 opt->fixed = 1;

192 opt->pcre = 0;

194 - opt->regflags &= ~REG_EXTENDED;

193 break;

194

195 case GREP_PATTERN_TYPE_PCRE:

196 opt->fixed = 0;

197 opt->pcre = 1;

200 - opt->regflags &= ~REG_EXTENDED;

198 break;

199 }

200 }

@@ -415,10 +412,9 @@ static void compile_fixed_regexp(struct grep_pat *p, struct grep_opt *opt)

412 {

413 struct strbuf sb = STRBUF_INIT;

414 int err;

418 - int regflags;

415 + int regflags = opt->regflags;

416

417 basic_regex_quote_buf(&sb, p->pattern);

421 - regflags = opt->regflags & ~REG_EXTENDED;

418 if (opt->ignore_case)

419 regflags |= REG_ICASE;

420 err = regcomp(&p->regexp, sb.buf, regflags);