Mercurial > gnulib

diff lib/regcomp.c @ 12847:64dad3a0ba71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
regcomp.c: avoid a new -Wshadow warning * lib/regcomp.c (create_initial_state): Do not shadow local "err".
author Jim Meyering <meyering@redhat.com>
date Wed, 03 Feb 2010 17:15:03 +0100
parents 00cfc5186819
children 69c1f6834276
line wrap: on
line diff
--- a/lib/regcomp.c	Tue Jan 19 08:25:12 2010 +0100
+++ b/lib/regcomp.c	Wed Feb 03 17:15:03 2010 +0100
@@ -1021,11 +1021,10 @@
 	    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;
 	      }
 	  }