Mercurial > hg > octave-kai > gnulib-hg
changeset 12847:64dad3a0ba71
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 | 47a829b330dc |
children | 69c1f6834276 |
files | ChangeLog lib/regcomp.c |
diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -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; } }