Mercurial > hg > octave-nkf > gnulib-hg
changeset 10955:5c229a7fba2a
Avoid gcc warnings on cygwin.
* lib/regex_internal.c (re_string_reconstruct) [!RE_ENABLE_I18N]:
Avoid unused variable.
* lib/regexec.c (check_arrival_add_next_nodes) [!RE_ENABLE_I18N]:
Likewise.
Signed-off-by: Eric Blake <ebb9@byu.net>
| author | Eric Blake <ebb9@byu.net> |
|---|---|
| date | Mon, 22 Dec 2008 06:11:32 -0700 |
| parents | a0bbe1a6f787 |
| children | d8cc4d459fe1 |
| files | ChangeLog lib/regex_internal.c lib/regexec.c |
| diffstat | 3 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-12-22 Eric Blake <ebb9@byu.net> + + Avoid gcc warnings on cygwin. + * lib/regex_internal.c (re_string_reconstruct) [!RE_ENABLE_I18N]: + Avoid unused variable. + * lib/regexec.c (check_arrival_add_next_nodes) [!RE_ENABLE_I18N]: + Likewise. + 2008-12-22 Bruno Haible <bruno@clisp.org> Remove HAVE_MBRTOWC conditionals.
--- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -687,10 +687,10 @@ } else { +#ifdef RE_ENABLE_I18N /* No, skip all characters until IDX. */ Idx prev_valid_len = pstr->valid_len; -#ifdef RE_ENABLE_I18N if (BE (pstr->offsets_needed, 0)) { pstr->len = pstr->raw_len - idx + offset;
--- a/lib/regexec.c +++ b/lib/regexec.c @@ -3079,7 +3079,9 @@ const re_dfa_t *const dfa = mctx->dfa; bool ok; Idx cur_idx; +#ifdef RE_ENABLE_I18N reg_errcode_t err = REG_NOERROR; +#endif re_node_set union_set; re_node_set_init_empty (&union_set); for (cur_idx = 0; cur_idx < cur_nodes->nelem; ++cur_idx)