summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorihiro Tanaka <noritnk@kcn.ne.jp>2014-10-15 08:24:23 +0900
committerJim Meyering <meyering@fb.com>2014-10-19 20:10:10 -0700
commitb2490802defe3c3bf7ef0036a4515d006a08a769 (patch)
treea63304bd71967f09e83487fd902ae7f1a80c74d5
parentf5cd191a624f33237d7618d1c24829ad501bc5c0 (diff)
downloadgrep-b2490802defe3c3bf7ef0036a4515d006a08a769.tar.gz
dfa: remove two erroneous clauses from a now-unused function
RE_DOT_NEWLINE and RE_DOT_NOT_NULL apply only to a dot that matches any character. Do not consider them when matching with a bracket expression. * src/dfa.c (match_mb_charset): Remove tests for RE_DOT_NEWLINE and RE_DOT_NOT_NULL.
-rw-r--r--src/dfa.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/dfa.c b/src/dfa.c
index de836891..80510a8a 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2998,17 +2998,7 @@ match_mb_charset (struct dfa *d, state_num s, position pos,
int context;
/* Check syntax bits. */
- if (wc == (wchar_t) eolbyte)
- {
- if (!(syntax_bits & RE_DOT_NEWLINE))
- return 0;
- }
- else if (wc == (wchar_t) '\0')
- {
- if (syntax_bits & RE_DOT_NOT_NULL)
- return 0;
- }
- else if (wc == WEOF)
+ if (wc == WEOF)
return 0;
context = wchar_context (wc);