* [PATCH] grep: simplify assignment of ->fixed
@ 2010-02-03 18:16 René Scharfe
0 siblings, 0 replies; only message in thread
From: René Scharfe @ 2010-02-03 18:16 UTC (permalink / raw)
To: Git Mailing List; +Cc: Junio C Hamano
After 885d211e, the value of the ->fixed pattern option only depends on
the grep option of the same name. Regex flags don't matter any more,
because fixed mode and regex mode are strictly separated. Thus we can
simply copy the value from struct grep_opt to struct grep_pat, as we do
already for ->word_regexp and ->ignore_case.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
---
grep.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/grep.c b/grep.c
index 60cce46..a0864f1 100644
--- a/grep.c
+++ b/grep.c
@@ -57,11 +57,8 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
p->word_regexp = opt->word_regexp;
p->ignore_case = opt->ignore_case;
+ p->fixed = opt->fixed;
- if (opt->fixed)
- p->fixed = 1;
- if (opt->regflags & REG_ICASE)
- p->fixed = 0;
if (p->fixed)
return;
--
1.7.0.rc1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-02-03 18:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-03 18:16 [PATCH] grep: simplify assignment of ->fixed René Scharfe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).