grep branch, master, updated. v2.25-83-gceac7ef

[Paul Eggert]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  ceac7eff585e024ee7b3ba812b0117b1fab7ed63 (commit)
       via  d6fd3c7111637bd4fd153195b9aa3e437c8bd9ef (commit)
      from  a00db587f6b90aa2c89112cb2beb90a8ccca226a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=ceac7eff585e024ee7b3ba812b0117b1fab7ed63


commit ceac7eff585e024ee7b3ba812b0117b1fab7ed63
Author: Paul Eggert <address@hidden>
Date:   Fri Sep 2 22:05:28 2016 -0700

    dfa: minor cleanup of previous change
    
    * src/dfa.c (dfaexec_main): Omit redundant code and reindent.

diff --git a/src/dfa.c b/src/dfa.c
index c5bebfe..5c045ac 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])
         {

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=d6fd3c7111637bd4fd153195b9aa3e437c8bd9ef


commit ceac7eff585e024ee7b3ba812b0117b1fab7ed63
Author: Paul Eggert <address@hidden>
Date:   Fri Sep 2 22:05:28 2016 -0700

    dfa: minor cleanup of previous change
    
    * src/dfa.c (dfaexec_main): Omit redundant code and reindent.

diff --git a/src/dfa.c b/src/dfa.c
index c5bebfe..5c045ac 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])
         {

-----------------------------------------------------------------------

Summary of changes:
 src/dfa.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep