From 107fb0e6719c49e35a6f4a3bdd0dabb19291efe0 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 3 Feb 2010 17:15:03 +0100 Subject: [PATCH] regcomp.c: avoid a new -Wshadow warning * lib/regcomp.c (create_initial_state): Do not shadow local "err". --- ChangeLog | 5 +++++ lib/regcomp.c | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97402e3094..fb38064dc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-02-03 Jim Meyering + + regcomp.c: avoid a new -Wshadow warning + * lib/regcomp.c (create_initial_state): Do not shadow local "err". + 2010-02-01 Jim Meyering removing useless parentheses in cpp #define directives diff --git a/lib/regcomp.c b/lib/regcomp.c index c653511add..32997ccdd5 100644 --- 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; } } -- 2.30.2