grep branch, master, updated. v2.10-71-g3ade04b

[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  3ade04b83128c0b0edbb17a83e98cadaf03b4fa4 (commit)
      from  7a98af1c1fe90b1681565ac21a49d37b91e594b9 (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=3ade04b83128c0b0edbb17a83e98cadaf03b4fa4


commit 3ade04b83128c0b0edbb17a83e98cadaf03b4fa4
Author: Jim Meyering <address@hidden>
Date:   Sun Feb 5 17:58:25 2012 +0100

    build: accommodate -Wshadow and -Werror=suggest-attribute=pure
    
    * src/dfa.c (state_separate_contexts): Add _GL_ATTRIBUTE_PURE.
    (dfaexec): Rename parameter, s/newline/allow_nl/, to avoid
    shadowing the global.

diff --git a/src/dfa.c b/src/dfa.c
index b46cd35..01f3645 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2127,8 +2127,8 @@ charclass_context(charclass c)
    also different from the follow set of the complement set.  However,
    all contexts in the complement set will have the same follow set.  */
 
-static int
-state_separate_contexts(position_set *s, int possible_contexts)
+static int _GL_ATTRIBUTE_PURE
+state_separate_contexts (position_set *s, int possible_contexts)
 {
   int separate_context = 0;
   unsigned int j;
@@ -3266,14 +3266,14 @@ prepare_wc_buf (const char *begin, const char *end)
    points to the beginning of the buffer, and END points to the first byte
    after its end.  Note however that we store a sentinel byte (usually
    newline) in *END, so the actual buffer must be one byte longer.
-   When NEWLINE is nonzero, newlines may appear in the matching string.
+   When ALLOW_NL is nonzero, newlines may appear in the matching string.
    If COUNT is non-NULL, increment *COUNT once for each newline processed.
    Finally, if BACKREF is non-NULL set *BACKREF to indicate whether we
    encountered a back-reference (1) or not (0).  The caller may use this
    to decide whether to fall back on a backtracking matcher. */
 char *
 dfaexec (struct dfa *d, char const *begin, char *end,
-         int newline, int *count, int *backref)
+         int allow_nl, int *count, int *backref)
 {
   int s, s1;           /* Current state. */
   unsigned char const *p; /* Current input character. */
@@ -3404,7 +3404,7 @@ dfaexec (struct dfa *d, char const *begin, char *end,
           continue;
         }
 
-      if (p[-1] == eol && newline)
+      if (p[-1] == eol && allow_nl)
         {
           s = d->newlines[s1];
           continue;

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

Summary of changes:
 src/dfa.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
grep