From d2822d2338678c7deaa404d848ddbcf52fa9de31 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 22 Dec 2008 06:11:32 -0700 Subject: [PATCH] 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 --- ChangeLog | 8 ++++++++ lib/regex_internal.c | 4 ++-- lib/regexec.c | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 798c04ef25..29322df293 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-12-22 Eric Blake + + 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 Remove HAVE_MBRTOWC conditionals. diff --git a/lib/regex_internal.c b/lib/regex_internal.c index 7f9a3ae0e5..977b15a4a2 100644 --- 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 . @@ -687,10 +687,10 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags) } 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; diff --git a/lib/regexec.c b/lib/regexec.c index 3e51b49cfe..2afa5b3879 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -3079,7 +3079,9 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx, 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) -- 2.30.2