mirror of
https://github.com/git/git
synced 2024-08-24 10:15:51 +00:00
grep: inline the return value of a function call used only once
Since e944d9d932
("grep: rewrite an if/else condition to avoid
duplicate expression", 2016-06-25) the "ascii_only" variable has only
been used once in compile_regexp(), let's just inline it there.
This makes the code easier to read, and might make it marginally
faster depending on compiler optimizations.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b14cf112e2
commit
f463beb805
4
grep.c
4
grep.c
|
@ -650,13 +650,11 @@ static void compile_fixed_regexp(struct grep_pat *p, struct grep_opt *opt)
|
|||
|
||||
static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
|
||||
{
|
||||
int ascii_only;
|
||||
int err;
|
||||
int regflags = REG_NEWLINE;
|
||||
|
||||
p->word_regexp = opt->word_regexp;
|
||||
p->ignore_case = opt->ignore_case;
|
||||
ascii_only = !has_non_ascii(p->pattern);
|
||||
|
||||
/*
|
||||
* Even when -F (fixed) asks us to do a non-regexp search, we
|
||||
|
@ -673,7 +671,7 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
|
|||
if (opt->fixed ||
|
||||
has_null(p->pattern, p->patternlen) ||
|
||||
is_fixed(p->pattern, p->patternlen))
|
||||
p->fixed = !p->ignore_case || ascii_only;
|
||||
p->fixed = !p->ignore_case || !has_non_ascii(p->pattern);
|
||||
|
||||
if (p->fixed) {
|
||||
p->kws = kwsalloc(p->ignore_case ? tolower_trans_tbl : NULL);
|
||||
|
|
Loading…
Reference in a new issue