summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-09-02 22:05:28 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-09-02 22:05:54 -0700
commitceac7eff585e024ee7b3ba812b0117b1fab7ed63 (patch)
treea8d0613c76e002cf9bd45d26636bb355504e5e12
parentd6fd3c7111637bd4fd153195b9aa3e437c8bd9ef (diff)
downloadgrep-ceac7eff585e024ee7b3ba812b0117b1fab7ed63.tar.gz
dfa: minor cleanup of previous change
* src/dfa.c (dfaexec_main): Omit redundant code and reindent.
-rw-r--r--src/dfa.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/dfa.c b/src/dfa.c
index c5bebfed..5c045ac3 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3171,12 +3171,10 @@ dfaexec_main (struct dfa *d, char const *begin, char *end, bool allow_nl,
nlcount++;
mbp = p;
- s = allow_nl ? d->newlines[s1] : 0;
-
s = (allow_nl ? d->newlines[s1]
- : (d->syntax.sbit[eol] == CTX_NEWLINE ? 0
- : (d->syntax.sbit[eol] == CTX_LETTER ? d->min_trcount - 1
- : d->initstate_notbol)));
+ : d->syntax.sbit[eol] == CTX_NEWLINE ? 0
+ : d->syntax.sbit[eol] == CTX_LETTER ? d->min_trcount - 1
+ : d->initstate_notbol);
}
else if (d->fails[s])
{