kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

grep: remove redundant and verbose re-assignments to 0 

Remove the redundant re-assignments of the fixed/pcre1/pcre2 fields to
zero right after the entire struct has been set to zero via
memset(...).

See an earlier related cleanup commit e0b9f8ae09 ("grep: remove
redundant regflags assignments", 2017-05-25) for an explanation of why
the code was structured like this to begin with.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 2017-06-29 22:22:20 +00:00 committed by Junio C Hamano
parent 885ef80d39
commit b07ed4e532
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
grep.c
View File

@ -174,28 +174,18 @@ static void grep_set_pattern_type_option(enum grep_pattern_type pattern_type, st
/* fall through */ /* fall through */


case GREP_PATTERN_TYPE_BRE: case GREP_PATTERN_TYPE_BRE:
opt->fixed = 0;
opt->pcre1 = 0;
opt->pcre2 = 0;
break; break;


case GREP_PATTERN_TYPE_ERE: case GREP_PATTERN_TYPE_ERE:
opt->fixed = 0;
opt->pcre1 = 0;
opt->pcre2 = 0;
opt->regflags |= REG_EXTENDED; opt->regflags |= REG_EXTENDED;
break; break;


case GREP_PATTERN_TYPE_FIXED: case GREP_PATTERN_TYPE_FIXED:
opt->fixed = 1; opt->fixed = 1;
opt->pcre1 = 0;
opt->pcre2 = 0;
break; break;


case GREP_PATTERN_TYPE_PCRE: case GREP_PATTERN_TYPE_PCRE:
opt->fixed = 0;
#ifdef USE_LIBPCRE2 #ifdef USE_LIBPCRE2
opt->pcre1 = 0;
opt->pcre2 = 1; opt->pcre2 = 1;
#else #else
/* /*
@ -205,7 +195,6 @@ static void grep_set_pattern_type_option(enum grep_pattern_type pattern_type, st
* "cannot use Perl-compatible regexes[...]". * "cannot use Perl-compatible regexes[...]".
*/ */
opt->pcre1 = 1; opt->pcre1 = 1;
opt->pcre2 = 0;
#endif #endif
break; break;
} }