grep branch, master, updated. v2.15-13-gba7ecab

[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  ba7ecab408cc5beafb93ecde7a9528a08df5afeb (commit)
       via  6f20f5412ef66885ab3df08ad2b6f598ad36fe18 (commit)
       via  354209b0cfc5402aa1ebd8835135e04e36a3a6f4 (commit)
      from  9316d536321af0c44f75a1e62d910f6444f02318 (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=ba7ecab408cc5beafb93ecde7a9528a08df5afeb


commit ba7ecab408cc5beafb93ecde7a9528a08df5afeb
Author: Jim Meyering <address@hidden>
Date:   Mon Dec 16 10:32:50 2013 -0800

    maint: add comments and split some long lines
    
    * src/main.c (do_execute): Add a comment.
    Split some lines longer than 80 bytes.

diff --git a/src/main.c b/src/main.c
index 6ee1632..1dfbcb6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -933,7 +933,7 @@ prline (char const *beg, char const *lim, int sep)
   if ((only_matching && matching)
       || (color_option  && (*line_color || *match_color)))
     {
-      /* We already know that non-matching lines have no match (to colorize).  
*/
+      /* We already know that non-matching lines have no match (to colorize). 
*/
       if (matching && (only_matching || *match_color))
         beg = print_line_middle (beg, lim, line_color, match_color);
 
@@ -1047,8 +1047,12 @@ prtext (char const *beg, char const *lim, intmax_t 
*nlinesp)
   used = 1;
 }
 
+/* Invoke the matcher, EXECUTE, on buffer BUF of SIZE bytes.  If there
+   is no match, return (size_t) -1.  Otherwise, set *MATCH_SIZE to the
+   length of the match and return the offset of the start of the match.  */
 static size_t
-do_execute (char const *buf, size_t size, size_t *match_size, char const 
*start_ptr)
+do_execute (char const *buf, size_t size, size_t *match_size,
+            char const *start_ptr)
 {
   size_t result;
   const char *line_next;
@@ -1071,7 +1075,8 @@ do_execute (char const *buf, size_t size, size_t 
*match_size, char const *start_
   for (line_next = buf; line_next < buf + size; )
     {
       const char *line_buf = line_next;
-      const char *line_end = memchr (line_buf, eolbyte, (buf + size) - 
line_buf);
+      const char *line_end = memchr (line_buf, eolbyte,
+                                     (buf + size) - line_buf);
       if (line_end == NULL)
         line_next = line_end = buf + size;
       else
@@ -1215,7 +1220,8 @@ grep (int fd, struct stat const *st)
             nlines += grepbuf (beg, lim);
           if (pending)
             prpending (lim);
-          if ((!outleft && !pending) || (nlines && done_on_match && 
!out_invert))
+          if ((!outleft && !pending)
+              || (nlines && done_on_match && !out_invert))
             goto finish_grep;
         }
 

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


commit ba7ecab408cc5beafb93ecde7a9528a08df5afeb
Author: Jim Meyering <address@hidden>
Date:   Mon Dec 16 10:32:50 2013 -0800

    maint: add comments and split some long lines
    
    * src/main.c (do_execute): Add a comment.
    Split some lines longer than 80 bytes.

diff --git a/src/main.c b/src/main.c
index 6ee1632..1dfbcb6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -933,7 +933,7 @@ prline (char const *beg, char const *lim, int sep)
   if ((only_matching && matching)
       || (color_option  && (*line_color || *match_color)))
     {
-      /* We already know that non-matching lines have no match (to colorize).  
*/
+      /* We already know that non-matching lines have no match (to colorize). 
*/
       if (matching && (only_matching || *match_color))
         beg = print_line_middle (beg, lim, line_color, match_color);
 
@@ -1047,8 +1047,12 @@ prtext (char const *beg, char const *lim, intmax_t 
*nlinesp)
   used = 1;
 }
 
+/* Invoke the matcher, EXECUTE, on buffer BUF of SIZE bytes.  If there
+   is no match, return (size_t) -1.  Otherwise, set *MATCH_SIZE to the
+   length of the match and return the offset of the start of the match.  */
 static size_t
-do_execute (char const *buf, size_t size, size_t *match_size, char const 
*start_ptr)
+do_execute (char const *buf, size_t size, size_t *match_size,
+            char const *start_ptr)
 {
   size_t result;
   const char *line_next;
@@ -1071,7 +1075,8 @@ do_execute (char const *buf, size_t size, size_t 
*match_size, char const *start_
   for (line_next = buf; line_next < buf + size; )
     {
       const char *line_buf = line_next;
-      const char *line_end = memchr (line_buf, eolbyte, (buf + size) - 
line_buf);
+      const char *line_end = memchr (line_buf, eolbyte,
+                                     (buf + size) - line_buf);
       if (line_end == NULL)
         line_next = line_end = buf + size;
       else
@@ -1215,7 +1220,8 @@ grep (int fd, struct stat const *st)
             nlines += grepbuf (beg, lim);
           if (pending)
             prpending (lim);
-          if ((!outleft && !pending) || (nlines && done_on_match && 
!out_invert))
+          if ((!outleft && !pending)
+              || (nlines && done_on_match && !out_invert))
             goto finish_grep;
         }
 

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


commit ba7ecab408cc5beafb93ecde7a9528a08df5afeb
Author: Jim Meyering <address@hidden>
Date:   Mon Dec 16 10:32:50 2013 -0800

    maint: add comments and split some long lines
    
    * src/main.c (do_execute): Add a comment.
    Split some lines longer than 80 bytes.

diff --git a/src/main.c b/src/main.c
index 6ee1632..1dfbcb6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -933,7 +933,7 @@ prline (char const *beg, char const *lim, int sep)
   if ((only_matching && matching)
       || (color_option  && (*line_color || *match_color)))
     {
-      /* We already know that non-matching lines have no match (to colorize).  
*/
+      /* We already know that non-matching lines have no match (to colorize). 
*/
       if (matching && (only_matching || *match_color))
         beg = print_line_middle (beg, lim, line_color, match_color);
 
@@ -1047,8 +1047,12 @@ prtext (char const *beg, char const *lim, intmax_t 
*nlinesp)
   used = 1;
 }
 
+/* Invoke the matcher, EXECUTE, on buffer BUF of SIZE bytes.  If there
+   is no match, return (size_t) -1.  Otherwise, set *MATCH_SIZE to the
+   length of the match and return the offset of the start of the match.  */
 static size_t
-do_execute (char const *buf, size_t size, size_t *match_size, char const 
*start_ptr)
+do_execute (char const *buf, size_t size, size_t *match_size,
+            char const *start_ptr)
 {
   size_t result;
   const char *line_next;
@@ -1071,7 +1075,8 @@ do_execute (char const *buf, size_t size, size_t 
*match_size, char const *start_
   for (line_next = buf; line_next < buf + size; )
     {
       const char *line_buf = line_next;
-      const char *line_end = memchr (line_buf, eolbyte, (buf + size) - 
line_buf);
+      const char *line_end = memchr (line_buf, eolbyte,
+                                     (buf + size) - line_buf);
       if (line_end == NULL)
         line_next = line_end = buf + size;
       else
@@ -1215,7 +1220,8 @@ grep (int fd, struct stat const *st)
             nlines += grepbuf (beg, lim);
           if (pending)
             prpending (lim);
-          if ((!outleft && !pending) || (nlines && done_on_match && 
!out_invert))
+          if ((!outleft && !pending)
+              || (nlines && done_on_match && !out_invert))
             goto finish_grep;
         }
 

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

Summary of changes:
 src/main.c       |   14 ++++++++++----
 src/pcresearch.c |   21 +++++++++++----------
 2 files changed, 21 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
grep