grep branch, master, updated. v2.10-2-gea1a3cb

[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  ea1a3cbdf3cb751d0e862b4dcdd8cf449d9d944f (commit)
      from  4e16f2a3f0ee4dcf96997420659e75b121c4783e (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=ea1a3cbdf3cb751d0e862b4dcdd8cf449d9d944f


commit ea1a3cbdf3cb751d0e862b4dcdd8cf449d9d944f
Author: Jim Meyering <address@hidden>
Date:   Sat Nov 19 22:04:13 2011 +0100

    maint: accommodate -Wdeclaration-after-statement, but only in dfa.c,
    
    and because doing so does not impact readability/maintainability.
    This is solely to accommodate gawk users who are stuck with ancient gcc.
    This is no excuse to change any other code in grep.
    * src/dfa.c (dfaoptimize, parse_bracket_exp): Move declaration
    to precede first statement in block.

diff --git a/src/dfa.c b/src/dfa.c
index dc87915..8db4aba 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -785,6 +785,7 @@ parse_bracket_exp (void)
 
   wint_t wc;
   wint_t wc2;
+  wint_t wc1 = 0;
 
   /* Work area to build a mb_char_classes.  */
   struct mb_char_classes *work_mbc;
@@ -819,7 +820,6 @@ parse_bracket_exp (void)
   else
     invert = 0;
 
-  wint_t wc1 = 0;
   colon_warning_state = (c == ':');
   do
     {
@@ -3420,10 +3420,11 @@ dfainit (struct dfa *d)
 static void
 dfaoptimize (struct dfa *d)
 {
+  unsigned int i;
+
   if (!MBS_SUPPORT || !using_utf8())
     return;
 
-  unsigned int i;
   for (i = 0; i < d->tindex; ++i)
     {
       switch(d->tokens[i])

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

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


hooks/post-receive
-- 
grep