grep branch, master, updated. v2.18-117-g61c8431

[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  61c8431a8cb6b6de247e833e1daf69df1d454c96 (commit)
       via  cf2c31225b13c4d1ea2047db05397b2f8d69d08b (commit)
      from  10ce910928c757d1adb790a9c9e5bad7de289bd4 (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=61c8431a8cb6b6de247e833e1daf69df1d454c96


commit 61c8431a8cb6b6de247e833e1daf69df1d454c96
Author: Paul Eggert <address@hidden>
Date:   Sat May 3 15:37:17 2014 -0700

    grep: clarify EGexecute slightly
    
    * src/dfasearch.c (EGexecute): Change if-then-else to !if-else-then.

diff --git a/src/dfasearch.c b/src/dfasearch.c
index 6d27489..4b3c79a 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -257,9 +257,9 @@ EGexecute (char const *buf, size_t size, size_t *match_size,
               end = ((exact_kwset_match || !dfafast
                       || MAX (16, match - beg) < (match - prev_beg) >> 2)
                      ? match
-                     : (buflim - prev_beg) >> 2 <= MAX (16, match - beg)
-                     ? buflim
-                     : prev_beg + 4 * MAX (16, match - beg));
+                     : MAX (16, match - beg) < (buflim - prev_beg) >> 2
+                     ? prev_beg + 4 * MAX (16, match - beg)
+                     : buflim);
               end = memchr (end, eol, buflim - end);
               end = end ? end + 1 : buflim;
 

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


commit 61c8431a8cb6b6de247e833e1daf69df1d454c96
Author: Paul Eggert <address@hidden>
Date:   Sat May 3 15:37:17 2014 -0700

    grep: clarify EGexecute slightly
    
    * src/dfasearch.c (EGexecute): Change if-then-else to !if-else-then.

diff --git a/src/dfasearch.c b/src/dfasearch.c
index 6d27489..4b3c79a 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -257,9 +257,9 @@ EGexecute (char const *buf, size_t size, size_t *match_size,
               end = ((exact_kwset_match || !dfafast
                       || MAX (16, match - beg) < (match - prev_beg) >> 2)
                      ? match
-                     : (buflim - prev_beg) >> 2 <= MAX (16, match - beg)
-                     ? buflim
-                     : prev_beg + 4 * MAX (16, match - beg));
+                     : MAX (16, match - beg) < (buflim - prev_beg) >> 2
+                     ? prev_beg + 4 * MAX (16, match - beg)
+                     : buflim);
               end = memchr (end, eol, buflim - end);
               end = end ? end + 1 : buflim;
 

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

Summary of changes:
 src/dfasearch.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
grep