summaryrefslogtreecommitdiff
path: root/grep.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2019-07-01 21:20:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-01 21:33:14 (GMT)
commitf463beb805638830e2a6b16359f94d8afca289ee (patch)
tree2a1cd02c7c9e9ede916018113cc38174f226c8f1 /grep.c
parentb14cf112e2c3d86de931276c2c778004a168db65 (diff)
downloadgit-f463beb805638830e2a6b16359f94d8afca289ee.zip
git-f463beb805638830e2a6b16359f94d8afca289ee.tar.gz
git-f463beb805638830e2a6b16359f94d8afca289ee.tar.bz2
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>
Diffstat (limited to 'grep.c')
-rw-r--r--grep.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/grep.c b/grep.c
index 1de4ab4..4e8d064 100644
--- a/grep.c
+++ b/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);