grep branch, master, updated. v2.19-3-g879d86e

[Jim Meyering]

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  879d86e6242eae688f9e72d42b230348d1c93a8f (commit)
       via  436b6695473cef6512b6a5e7961b4433e599f79f (commit)
      from  3b9660f8bc156d161df1d939b341510b8ef0cb06 (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=879d86e6242eae688f9e72d42b230348d1c93a8f


commit 879d86e6242eae688f9e72d42b230348d1c93a8f
Author: Jim Meyering <address@hidden>
Date:   Fri May 23 20:14:07 2014 -0700

    maint: revert "grep: port mb_next_wc to RHEL 6.5 x86-64"
    
    This reverts commit v2.18-148-ga6ae68d.
    Now that we have gnulib change v0.1-131-g2a045bc, "mbrlen, mbrtowc:
    fix bug with empty input", this work-around is no longer needed.

diff --git a/src/searchutils.c b/src/searchutils.c
index 18dd584..5eb9a12 100644
--- a/src/searchutils.c
+++ b/src/searchutils.c
@@ -285,6 +285,5 @@ mb_next_wc (char const *cur, char const *end)
 {
   wchar_t wc;
   mbstate_t mbs = { 0 };
-  return (end - cur != 0 && mbrtowc (&wc, cur, end - cur, &mbs) < (size_t) -2
-          ? wc : WEOF);
+  return mbrtowc (&wc, cur, end - cur, &mbs) < (size_t) -2 ? wc : WEOF;
 }

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


commit 879d86e6242eae688f9e72d42b230348d1c93a8f
Author: Jim Meyering <address@hidden>
Date:   Fri May 23 20:14:07 2014 -0700

    maint: revert "grep: port mb_next_wc to RHEL 6.5 x86-64"
    
    This reverts commit v2.18-148-ga6ae68d.
    Now that we have gnulib change v0.1-131-g2a045bc, "mbrlen, mbrtowc:
    fix bug with empty input", this work-around is no longer needed.

diff --git a/src/searchutils.c b/src/searchutils.c
index 18dd584..5eb9a12 100644
--- a/src/searchutils.c
+++ b/src/searchutils.c
@@ -285,6 +285,5 @@ mb_next_wc (char const *cur, char const *end)
 {
   wchar_t wc;
   mbstate_t mbs = { 0 };
-  return (end - cur != 0 && mbrtowc (&wc, cur, end - cur, &mbs) < (size_t) -2
-          ? wc : WEOF);
+  return mbrtowc (&wc, cur, end - cur, &mbs) < (size_t) -2 ? wc : WEOF;
 }

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

Summary of changes:
 gnulib            |    2 +-
 src/searchutils.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
grep