threads / patch / 22507

patchgrep: simplify assignment of ->fixed

Subject: [PATCH] grep: simplify assignment of ->fixed

## tl;dr

One message between Feb 3, 2010 and Feb 3, 2010. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

René Scharfe· Feb 3, 2010, 18:16 UTC · lore

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(-)
Show changes to grep.c +1 −4
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

← back to recent threads