From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 19 Aug 2005 23:27:14 +0000 (+0000)
Subject: (proceed_next_node): Redo local variables to avoid GCC shadowing warnings.
X-Git-Tag: cvs-readonly~3117
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=79d7833a0789532be2c572578d82227f7dcd52dc;p=gnulib.git

(proceed_next_node): Redo local variables to avoid GCC shadowing warnings.
---

diff --git a/lib/regexec.c b/lib/regexec.c
index cb6234128..96e0aa4c1 100644
--- a/lib/regexec.c
+++ b/lib/regexec.c
@@ -1236,8 +1236,7 @@ proceed_next_node (mctx, nregs, regs, pidx, node, eps_via_nodes, fs)
     struct re_fail_stack_t *fs;
 {
   re_dfa_t *const dfa = mctx->dfa;
-  int i, err, dest_node;
-  dest_node = -1;
+  int i, err;
   if (IS_EPSILON_NODE (dfa->nodes[node].type))
     {
       re_node_set *cur_nodes = &mctx->state_log[*pidx]->nodes;
@@ -1303,6 +1302,7 @@ proceed_next_node (mctx, nregs, regs, pidx, node, eps_via_nodes, fs)
 
 	  if (naccepted == 0)
 	    {
+	      int dest_node;
 	      err = re_node_set_insert (eps_via_nodes, node);
 	      if (BE (err < 0, 0))
 		return -2;
@@ -1316,7 +1316,7 @@ proceed_next_node (mctx, nregs, regs, pidx, node, eps_via_nodes, fs)
       if (naccepted != 0
 	  || check_node_accept (mctx, dfa->nodes + node, *pidx))
 	{
-	  dest_node = dfa->nexts[node];
+	  int dest_node = dfa->nexts[node];
 	  *pidx = (naccepted == 0) ? *pidx + 1 : *pidx + naccepted;
 	  if (fs && (*pidx > mctx->match_last || mctx->state_log[*pidx] == NULL
 		     || !re_node_set_contains (&mctx->state_log[*pidx]->nodes,