This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26.9000-805-g0285e6b
- From: eggert at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 22 Nov 2017 19:22:33 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26.9000-805-g0285e6b
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 0285e6bdf223314d7751a83795001c0e87a1f825 (commit)
from 4bae615022cb5a5da79ccda83cc6c9ba9f2d479c (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=0285e6bdf223314d7751a83795001c0e87a1f825
commit 0285e6bdf223314d7751a83795001c0e87a1f825
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed Nov 22 11:21:44 2017 -0800
* posix/regcomp.c (init_word_char): Add comments.
diff --git a/ChangeLog b/ChangeLog
index 013d1e4..e67b128 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-11-22 Paul Eggert <eggert@cs.ucla.edu>
+
+ * posix/regcomp.c (init_word_char): Add comments.
+
2017-11-22 Joseph Myers <joseph@codesourcery.com>
[BZ #22447]
diff --git a/posix/regcomp.c b/posix/regcomp.c
index 520596b..81c2932 100644
--- a/posix/regcomp.c
+++ b/posix/regcomp.c
@@ -925,12 +925,15 @@ init_word_char (re_dfa_t *dfa)
int ch = 0;
if (BE (dfa->map_notascii == 0, 1))
{
+ /* Avoid uint32_t and uint64_t as some non-GCC platforms lack
+ them, an issue when this code is used in Gnulib. */
bitset_word_t bits0 = 0x00000000;
bitset_word_t bits1 = 0x03ff0000;
bitset_word_t bits2 = 0x87fffffe;
bitset_word_t bits3 = 0x07fffffe;
if (BITSET_WORD_BITS == 64)
{
+ /* Pacify gcc -Woverflow on 32-bit platformns. */
dfa->word_char[0] = bits1 << 31 << 1 | bits0;
dfa->word_char[1] = bits3 << 31 << 1 | bits2;
i = 2;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
posix/regcomp.c | 3 +++
2 files changed, 7 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources