regcomp.c: avoid a new -Wshadow warning

[pspp] / lib / regcomp.c

diff --git a/lib/regcomp.c b/lib/regcomp.c
index c653511add039b3e9d9f331648d7ba4de0caab88..32997ccdd536220e8bc4146320cb4f23912e4caa 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;
              }
          }