This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.26.9000-1034-ged8ae46


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  ed8ae46bed42772a5b22b710fb12d7f59ae084b4 (commit)
      from  bad7a0c81f501fbbcc79af9eaa4b8254441c4a1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ed8ae46bed42772a5b22b710fb12d7f59ae084b4

commit ed8ae46bed42772a5b22b710fb12d7f59ae084b4
Author: Eric Blake <ebb9@byu.net>
Date:   Fri Dec 22 07:57:25 2017 -0800

    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.

diff --git a/ChangeLog b/ChangeLog
index 14950fe..b296ec0 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 a97f703..705d6a4 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 95e31d3..4cf1eea 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)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |    7 +++++++
 posix/regex_internal.c |    2 +-
 posix/regexec.c        |    2 ++
 3 files changed, 10 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]