grep branch, master, updated. v2.6-15-ga0e3040

[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  a0e3040fd80528163565779a85a95b80469b7dfa (commit)
      from  8f08d8e282bf3d4917e94135e67ba17d738313ce (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=a0e3040fd80528163565779a85a95b80469b7dfa


commit a0e3040fd80528163565779a85a95b80469b7dfa
Author: Jim Meyering <address@hidden>
Date:   Thu Mar 25 11:36:50 2010 +0100

    build: avoid warnings about unnecessary use of "return"
    
    * src/grep.c (Gcompile, Ecompile, Acompile): Do not "return X"
    from a function returning void, not even when X itself is a
    function returning void.  This avoids warnings from Sun Studio 11
    reported by Dagobert Michelsen.
    * src/egrep.c (Ecompile): Likewise.

diff --git a/src/egrep.c b/src/egrep.c
index 80595fe..f6a1d59 100644
--- a/src/egrep.c
+++ b/src/egrep.c
@@ -4,7 +4,7 @@
 static void
 Ecompile (char const *pattern, size_t size)
 {
-  return GEAcompile (pattern, size, RE_SYNTAX_POSIX_EGREP | 
RE_NO_EMPTY_RANGES);
+  GEAcompile (pattern, size, RE_SYNTAX_POSIX_EGREP | RE_NO_EMPTY_RANGES);
 }
 
 struct matcher const matchers[] = {
diff --git a/src/grep.c b/src/grep.c
index 8ef4968..1a4166c 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -4,22 +4,22 @@
 static void
 Gcompile (char const *pattern, size_t size)
 {
-  return GEAcompile (pattern, size,
-                    RE_SYNTAX_GREP
-                    | RE_HAT_LISTS_NOT_NEWLINE
-                    | RE_NO_EMPTY_RANGES);
+  GEAcompile (pattern, size,
+             RE_SYNTAX_GREP
+             | RE_HAT_LISTS_NOT_NEWLINE
+             | RE_NO_EMPTY_RANGES);
 }
 
 static void
 Ecompile (char const *pattern, size_t size)
 {
-  return GEAcompile (pattern, size, RE_SYNTAX_POSIX_EGREP | 
RE_NO_EMPTY_RANGES);
+  GEAcompile (pattern, size, RE_SYNTAX_POSIX_EGREP | RE_NO_EMPTY_RANGES);
 }
 
 static void
 Acompile (char const *pattern, size_t size)
 {
-  return GEAcompile (pattern, size, RE_SYNTAX_AWK);
+  GEAcompile (pattern, size, RE_SYNTAX_AWK);
 }
 
 struct matcher const matchers[] = {

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

Summary of changes:
 src/egrep.c |    2 +-
 src/grep.c  |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
grep