about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2017-12-22 07:57:25 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2017-12-22 08:01:27 -0800
commited8ae46bed42772a5b22b710fb12d7f59ae084b4 (patch)
tree21a080233937f9a97c8fd356cef8dadd5426018a
parentbad7a0c81f501fbbcc79af9eaa4b8254441c4a1f (diff)
downloadglibc-ed8ae46bed42772a5b22b710fb12d7f59ae084b4.tar.gz
glibc-ed8ae46bed42772a5b22b710fb12d7f59ae084b4.tar.xz
glibc-ed8ae46bed42772a5b22b710fb12d7f59ae084b4.zip
Avoid gcc warnings on cygwin
* posix/regex_internal.c (re_string_reconstruct) [!RE_ENABLE_I18N]:
* posix/regexec.c (check_arrival_add_next_nodes) [!RE_ENABLE_I18N]:
Avoid unused variable.
-rw-r--r--ChangeLog7
-rw-r--r--posix/regex_internal.c2
-rw-r--r--posix/regexec.c2
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 14950fe373..b296ec0ad6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-12-22  Eric Blake  <ebb9@byu.net>
+
+	Avoid gcc warnings on cygwin
+	* posix/regex_internal.c (re_string_reconstruct) [!RE_ENABLE_I18N]:
+	* posix/regexec.c (check_arrival_add_next_nodes) [!RE_ENABLE_I18N]:
+	Avoid unused variable.
+
 2017-12-22  Florian Weimer  <fweimer@redhat.com>
 
 	* io/Makefile (routines): Add copy_file_range.
diff --git a/posix/regex_internal.c b/posix/regex_internal.c
index a97f703bc7..705d6a4c73 100644
--- a/posix/regex_internal.c
+++ b/posix/regex_internal.c
@@ -681,10 +681,10 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)
 	}
       else
 	{
+#ifdef RE_ENABLE_I18N
 	  /* No, skip all characters until IDX.  */
 	  int 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/posix/regexec.c b/posix/regexec.c
index 95e31d3f80..4cf1eeafc5 100644
--- a/posix/regexec.c
+++ b/posix/regexec.c
@@ -2988,7 +2988,9 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, int str_idx,
   const re_dfa_t *const dfa = mctx->dfa;
   int result;
   int 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)