diff options
| author | Jim Meyering <meyering@fb.com> | 2014-05-23 20:14:07 -0700 |
|---|---|---|
| committer | Jim Meyering <meyering@fb.com> | 2014-05-23 20:20:07 -0700 |
| commit | 879d86e6242eae688f9e72d42b230348d1c93a8f (patch) | |
| tree | dc7f5ab39692991001f716d9a4bec0e78eeecc12 /src/searchutils.c | |
| parent | 436b6695473cef6512b6a5e7961b4433e599f79f (diff) | |
| download | grep-879d86e6242eae688f9e72d42b230348d1c93a8f.tar.gz | |
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.
Diffstat (limited to 'src/searchutils.c')
| -rw-r--r-- | src/searchutils.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/searchutils.c b/src/searchutils.c index 18dd584e..5eb9a12f 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; } |