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>

diff --git a/ChangeLog b/ChangeLog
index 798c04ef258fd81e0bd96b113d5f335df39f138f..29322df293ad8bb2ef2ff9a0a73c686a3b5e8429 100644 (file)
--- 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.

diff --git a/lib/regex_internal.c b/lib/regex_internal.c
index 7f9a3ae0e5662b3e80da8dd5b98c74e7f9a4d837..977b15a4a2dab2526bf2cb265a77e0c45786b18f 100644 (file)
--- 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 @@ 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 3e51b49cfeac4020311372066f485f4c3ab9bf1d..2afa5b387976e1caad983c076289a96abfdc2114 100644 (file)
--- 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)