regex_internal.c patch to avoid warnings with gcc -Wshadow

[Paul Eggert]

I installed this, adapted from coreutils.  I also filed glibc bug 1215
to merge it back into glibc.

2005-08-19  Paul Eggert  <address@hidden>

        * config/srclist.txt: Comment out $LIBCSRC/posix/regex_internal.c.
        * lib/regex_internal.c (re_string_realloc_buffers, re_node_set_insert):
        (re_node_set_insert_last, re_dfa_add_node):
        Rename local variables to avoid GCC shadowing warnings.

Index: config/srclist.txt
===================================================================
RCS file: /cvsroot/gnulib/gnulib/config/srclist.txt,v
retrieving revision 1.68
retrieving revision 1.69
diff -p -u -r1.68 -r1.69
--- config/srclist.txt  18 Aug 2005 05:23:01 -0000      1.68
+++ config/srclist.txt  19 Aug 2005 23:02:26 -0000      1.69
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.68 2005/08/18 05:23:01 eggert Exp $
+# $Id: srclist.txt,v 1.69 2005/08/19 23:02:26 eggert Exp $
 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 
@@ -103,7 +103,8 @@ $LIBCSRC/posix/regex.c                      lib gpl
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1207
 #$LIBCSRC/posix/regex.h                        lib gpl
 #
-$LIBCSRC/posix/regex_internal.c                lib gpl
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1215
+#$LIBCSRC/posix/regex_internal.c               lib gpl
 #
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1054
 #$LIBCSRC/posix/regex_internal.h               lib gpl
Index: lib/regex_internal.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/regex_internal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -u -r1.1 -r1.2
--- lib/regex_internal.c        7 Jul 2005 08:08:39 -0000       1.1
+++ lib/regex_internal.c        19 Aug 2005 23:00:55 -0000      1.2
@@ -147,26 +147,26 @@ re_string_realloc_buffers (pstr, new_buf
 #ifdef RE_ENABLE_I18N
   if (pstr->mb_cur_max > 1)
     {
-      wint_t *new_array = re_realloc (pstr->wcs, wint_t, new_buf_len);
-      if (BE (new_array == NULL, 0))
+      wint_t *new_wcs = re_realloc (pstr->wcs, wint_t, new_buf_len);
+      if (BE (new_wcs == NULL, 0))
        return REG_ESPACE;
-      pstr->wcs = new_array;
+      pstr->wcs = new_wcs;
       if (pstr->offsets != NULL)
        {
-         int *new_array = re_realloc (pstr->offsets, int, new_buf_len);
-         if (BE (new_array == NULL, 0))
+         int *new_offsets = re_realloc (pstr->offsets, int, new_buf_len);
+         if (BE (new_offsets == NULL, 0))
            return REG_ESPACE;
-         pstr->offsets = new_array;
+         pstr->offsets = new_offsets;
        }
     }
 #endif /* RE_ENABLE_I18N  */
   if (pstr->mbs_allocated)
     {
-      unsigned char *new_array = re_realloc (pstr->mbs, unsigned char,
-                                            new_buf_len);
-      if (BE (new_array == NULL, 0))
+      unsigned char *new_mbs = re_realloc (pstr->mbs, unsigned char,
+                                          new_buf_len);
+      if (BE (new_mbs == NULL, 0))
        return REG_ESPACE;
-      pstr->mbs = new_array;
+      pstr->mbs = new_mbs;
     }
   pstr->bufs_len = new_buf_len;
   return REG_NOERROR;
@@ -1226,12 +1226,12 @@ re_node_set_insert (set, elem)
   /* Realloc if we need.  */
   if (set->alloc == set->nelem)
     {
-      int *new_array;
+      int *new_elems;
       set->alloc = set->alloc * 2;
-      new_array = re_realloc (set->elems, int, set->alloc);
-      if (BE (new_array == NULL, 0))
+      new_elems = re_realloc (set->elems, int, set->alloc);
+      if (BE (new_elems == NULL, 0))
        return -1;
-      set->elems = new_array;
+      set->elems = new_elems;
     }
 
   /* Move the elements which follows the new element.  Test the
@@ -1266,12 +1266,12 @@ re_node_set_insert_last (set, elem)
   /* Realloc if we need.  */
   if (set->alloc == set->nelem)
     {
-      int *new_array;
+      int *new_elems;
       set->alloc = (set->alloc + 1) * 2;
-      new_array = re_realloc (set->elems, int, set->alloc);
-      if (BE (new_array == NULL, 0))
+      new_elems = re_realloc (set->elems, int, set->alloc);
+      if (BE (new_elems == NULL, 0))
        return -1;
-      set->elems = new_array;
+      set->elems = new_elems;
     }
 
   /* Insert the new element.  */
@@ -1348,11 +1348,11 @@ re_dfa_add_node (dfa, token)
       int *new_nexts, *new_indices;
       re_node_set *new_edests, *new_eclosures;
 
-      re_token_t *new_array = re_realloc (dfa->nodes, re_token_t,
+      re_token_t *new_nodes = re_realloc (dfa->nodes, re_token_t,
                                          new_nodes_alloc);
-      if (BE (new_array == NULL, 0))
+      if (BE (new_nodes == NULL, 0))
        return -1;
-      dfa->nodes = new_array;
+      dfa->nodes = new_nodes;
       new_nexts = re_realloc (dfa->nexts, int, new_nodes_alloc);
       new_indices = re_realloc (dfa->org_indices, int, new_nodes_alloc);
       new_edests = re_realloc (dfa->edests, re_node_set, new_nodes_alloc);