regcomp.c: avoid a new -Wshadow warning

* lib/regcomp.c (create_initial_state): Do not shadow local "err".

diff --git a/ChangeLog b/ChangeLog
index 97402e3..fb38064 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-03  Jim Meyering  <meyering@redhat.com>
+
+       regcomp.c: avoid a new -Wshadow warning
+       * lib/regcomp.c (create_initial_state): Do not shadow local "err".
+
 2010-02-01  Jim Meyering  <meyering@redhat.com>
 
        removing useless parentheses in cpp #define directives

diff --git a/lib/regcomp.c b/lib/regcomp.c
index c653511..32997cc 100644 (file)
--- a/lib/regcomp.c
+++ b/lib/regcomp.c
@@ -1021,11 +1021,10 @@ create_initial_state (re_dfa_t *dfa)
            Idx dest_idx = dfa->edests[node_idx].elems[0];
            if (!re_node_set_contains (&init_nodes, dest_idx))
              {
-               reg_errcode_t err = re_node_set_merge (&init_nodes,
-                                                      dfa->eclosures
-                                                      + dest_idx);
-               if (err != REG_NOERROR)
-                 return err;
+               reg_errcode_t merge_err
+                  = re_node_set_merge (&init_nodes, dfa->eclosures + dest_idx);
+               if (merge_err != REG_NOERROR)
+                 return merge_err;
                i = 0;
              }
          }