grep branch, master, updated. v2.8-32-g920a2d8

[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  920a2d8ad2b3fa66f3b3be3178c077b9e90a6f1f (commit)
       via  8a54f203127575f11b9a809e002aba22a365aebe (commit)
      from  5f7848a0dc89b30b15e3a76a8d53d43d4f746a36 (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=920a2d8ad2b3fa66f3b3be3178c077b9e90a6f1f


commit 920a2d8ad2b3fa66f3b3be3178c077b9e90a6f1f
Author: Jim Meyering <address@hidden>
Date:   Tue Jun 21 18:12:04 2011 +0200

    build: avoid a warning when building with --disable-perl-regexp...
    
    and --enable-gcc-warnings.
    * src/pcresearch.c (WITHOUT_PCRE_NORETURN): Define.
    Remove the unreachable return statement.
    Reported by Eric Blake.

diff --git a/src/pcresearch.c b/src/pcresearch.c
index e8c7f4b..f8581e0 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -101,13 +101,19 @@ Pcompile (char const *pattern, size_t size)
 #endif
 }
 
-size_t
+/* Pexecute is a no-return function when building --without-pcre.  */
+#if !HAVE_LIBPCRE
+# define WITHOUT_PCRE_NORETURN _GL_ATTRIBUTE_NORETURN
+#else
+# define WITHOUT_PCRE_NORETURN /* empty */
+#endif
+
+size_t WITHOUT_PCRE_NORETURN
 Pexecute (char const *buf, size_t size, size_t *match_size,
           char const *start_ptr)
 {
 #if !HAVE_LIBPCRE
   abort ();
-  return -1;
 #else
   /* This array must have at least two elements; everything after that
      is just for performance improvement in pcre_exec.  */

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


commit 920a2d8ad2b3fa66f3b3be3178c077b9e90a6f1f
Author: Jim Meyering <address@hidden>
Date:   Tue Jun 21 18:12:04 2011 +0200

    build: avoid a warning when building with --disable-perl-regexp...
    
    and --enable-gcc-warnings.
    * src/pcresearch.c (WITHOUT_PCRE_NORETURN): Define.
    Remove the unreachable return statement.
    Reported by Eric Blake.

diff --git a/src/pcresearch.c b/src/pcresearch.c
index e8c7f4b..f8581e0 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -101,13 +101,19 @@ Pcompile (char const *pattern, size_t size)
 #endif
 }
 
-size_t
+/* Pexecute is a no-return function when building --without-pcre.  */
+#if !HAVE_LIBPCRE
+# define WITHOUT_PCRE_NORETURN _GL_ATTRIBUTE_NORETURN
+#else
+# define WITHOUT_PCRE_NORETURN /* empty */
+#endif
+
+size_t WITHOUT_PCRE_NORETURN
 Pexecute (char const *buf, size_t size, size_t *match_size,
           char const *start_ptr)
 {
 #if !HAVE_LIBPCRE
   abort ();
-  return -1;
 #else
   /* This array must have at least two elements; everything after that
      is just for performance improvement in pcre_exec.  */

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

Summary of changes:
 src/pcresearch.c               |   10 ++++++++--
 tests/Makefile.am              |   11 +++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 tests/backref
 mode change 100644 => 100755 tests/backref-multibyte-slow
 mode change 100644 => 100755 tests/backref-word
 mode change 100644 => 100755 tests/bogus-wctob
 mode change 100644 => 100755 tests/bre
 mode change 100644 => 100755 tests/case-fold-backref
 mode change 100644 => 100755 tests/case-fold-char-class
 mode change 100644 => 100755 tests/case-fold-char-range
 mode change 100644 => 100755 tests/case-fold-char-type
 mode change 100644 => 100755 tests/char-class-multibyte
 mode change 100644 => 100755 tests/dfaexec-multibyte
 mode change 100644 => 100755 tests/equiv-classes
 mode change 100644 => 100755 tests/ere
 mode change 100644 => 100755 tests/euc-mb
 mode change 100644 => 100755 tests/fedora
 mode change 100644 => 100755 tests/fgrep-infloop
 mode change 100644 => 100755 tests/file
 mode change 100644 => 100755 tests/grep-dev-null
 mode change 100644 => 100755 tests/grep-dir
 mode change 100644 => 100755 tests/high-bit-range
 mode change 100644 => 100755 tests/ignore-mmap
 mode change 100644 => 100755 tests/include-exclude
 mode change 100644 => 100755 tests/inconsistent-range
 mode change 100644 => 100755 tests/khadafy
 mode change 100644 => 100755 tests/options
 mode change 100644 => 100755 tests/pcre
 mode change 100644 => 100755 tests/prefix-of-multibyte
 mode change 100644 => 100755 tests/reversed-range-endpoints
 mode change 100644 => 100755 tests/sjis-mb
 mode change 100644 => 100755 tests/spencer1
 mode change 100644 => 100755 tests/status
 mode change 100644 => 100755 tests/unibyte-bracket-expr
 mode change 100644 => 100755 tests/warn-char-classes
 mode change 100644 => 100755 tests/word-delim-multibyte
 mode change 100644 => 100755 tests/word-multi-file
 mode change 100644 => 100755 tests/yesno


hooks/post-receive
-- 
grep