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

grep: rewrite an if/else condition to avoid duplicate expression 

"!icase || ascii_only" is repeated twice in this if/else chain as this
series evolves. Rewrite it (and basically revert the first if
condition back to before the "grep: break down an "if" stmt..." commit).

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 2016-06-25 07:22:32 +02:00 committed by Junio C Hamano
parent 793dc676e0
commit e944d9d932
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
grep.c
View File

@ -442,11 +442,8 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
* simple string match using kws. p->fixed tells us if we * simple string match using kws. p->fixed tells us if we
* want to use kws. * want to use kws.
*/ */
if (opt->fixed) if (opt->fixed || is_fixed(p->pattern, p->patternlen))
p->fixed = !icase || ascii_only; p->fixed = !icase || ascii_only;
else if ((!icase || ascii_only) &&
is_fixed(p->pattern, p->patternlen))
p->fixed = 1;
else else
p->fixed = 0; p->fixed = 0;