grep branch, master, updated. v2.12-8-ge5a5657

[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  e5a5657e3c28c9ed26b6641cdc20c346962e3f97 (commit)
       via  c6254ca5fb9b3b513e54bd2a8de94c34af39fbc6 (commit)
      from  69d06a2c3c7cdcd296da4fe92d7ed7256c4d0395 (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=e5a5657e3c28c9ed26b6641cdc20c346962e3f97


commit e5a5657e3c28c9ed26b6641cdc20c346962e3f97
Author: Jim Meyering <address@hidden>
Date:   Mon Apr 30 09:56:52 2012 +0200

    cosmetic: binary operator goes *after* the newline, when split
    
    * src/dfa.c (match_mb_charset): Join split lines.
    (parse_bracket_exp): Move "||" from end of first split line
    to the beginning of the continued line.
    * src/dosbuf.c (dossified_pos): Likewise, but for "&&".

diff --git a/src/dfa.c b/src/dfa.c
index a78e760..96d462f 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -1121,8 +1121,8 @@ parse_bracket_exp (void)
               regcomp (&re, pattern, REG_NOSUB);
               for (c = 0; c < NOTCHAR; ++c)
                 {
-                  if ((case_fold && isupper (c)) ||
-                      (MB_CUR_MAX > 1 && btowc (c) == WEOF))
+                  if ((case_fold && isupper (c))
+                      || (MB_CUR_MAX > 1 && btowc (c) == WEOF))
                     continue;
                   subject[0] = c;
                   if (regexec (&re, subject, 0, NULL, 0) != REG_NOMATCH)
@@ -3036,8 +3036,7 @@ match_mb_charset (struct dfa *d, state_num s, position 
pos, size_t idx)
   /* match with a range?  */
   for (i = 0; i < work_mbc->nranges; i++)
     {
-      if (work_mbc->range_sts[i] <= wc &&
-          wc <= work_mbc->range_ends[i])
+      if (work_mbc->range_sts[i] <= wc && wc <= work_mbc->range_ends[i])
         goto charset_matched;
     }
 
diff --git a/src/dosbuf.c b/src/dosbuf.c
index 07f1280..bcbef16 100644
--- a/src/dosbuf.c
+++ b/src/dosbuf.c
@@ -184,8 +184,8 @@ dossified_pos (off_t byteno)
   if (byteno >= pos_hi)
     {
       out_map_idx++;
-      while (out_map_idx < dos_pos_map_used &&
-             byteno >= dos_pos_map[out_map_idx].pos)
+      while (out_map_idx < dos_pos_map_used
+             && byteno >= dos_pos_map[out_map_idx].pos)
         out_map_idx++;
     }
 

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


commit e5a5657e3c28c9ed26b6641cdc20c346962e3f97
Author: Jim Meyering <address@hidden>
Date:   Mon Apr 30 09:56:52 2012 +0200

    cosmetic: binary operator goes *after* the newline, when split
    
    * src/dfa.c (match_mb_charset): Join split lines.
    (parse_bracket_exp): Move "||" from end of first split line
    to the beginning of the continued line.
    * src/dosbuf.c (dossified_pos): Likewise, but for "&&".

diff --git a/src/dfa.c b/src/dfa.c
index a78e760..96d462f 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -1121,8 +1121,8 @@ parse_bracket_exp (void)
               regcomp (&re, pattern, REG_NOSUB);
               for (c = 0; c < NOTCHAR; ++c)
                 {
-                  if ((case_fold && isupper (c)) ||
-                      (MB_CUR_MAX > 1 && btowc (c) == WEOF))
+                  if ((case_fold && isupper (c))
+                      || (MB_CUR_MAX > 1 && btowc (c) == WEOF))
                     continue;
                   subject[0] = c;
                   if (regexec (&re, subject, 0, NULL, 0) != REG_NOMATCH)
@@ -3036,8 +3036,7 @@ match_mb_charset (struct dfa *d, state_num s, position 
pos, size_t idx)
   /* match with a range?  */
   for (i = 0; i < work_mbc->nranges; i++)
     {
-      if (work_mbc->range_sts[i] <= wc &&
-          wc <= work_mbc->range_ends[i])
+      if (work_mbc->range_sts[i] <= wc && wc <= work_mbc->range_ends[i])
         goto charset_matched;
     }
 
diff --git a/src/dosbuf.c b/src/dosbuf.c
index 07f1280..bcbef16 100644
--- a/src/dosbuf.c
+++ b/src/dosbuf.c
@@ -184,8 +184,8 @@ dossified_pos (off_t byteno)
   if (byteno >= pos_hi)
     {
       out_map_idx++;
-      while (out_map_idx < dos_pos_map_used &&
-             byteno >= dos_pos_map[out_map_idx].pos)
+      while (out_map_idx < dos_pos_map_used
+             && byteno >= dos_pos_map[out_map_idx].pos)
         out_map_idx++;
     }
 

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

Summary of changes:
 src/dfa.c    |    7 +++----
 src/dosbuf.c |    4 ++--
 src/main.c   |    2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
grep