qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* posix/regcomp.c (init_word_char): Add comments.

This commit is contained in:
Paul Eggert 2017-11-22 11:21:44 -08:00
parent 4bae615022
commit 0285e6bdf2
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> 2017-11-22 Joseph Myers <joseph@codesourcery.com>
[BZ #22447] [BZ #22447]

3
posix/regcomp.c
View File

@ -925,12 +925,15 @@ init_word_char (re_dfa_t *dfa)
int ch = 0; int ch = 0;
if (BE (dfa->map_notascii == 0, 1)) 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 bits0 = 0x00000000;
bitset_word_t bits1 = 0x03ff0000; bitset_word_t bits1 = 0x03ff0000;
bitset_word_t bits2 = 0x87fffffe; bitset_word_t bits2 = 0x87fffffe;
bitset_word_t bits3 = 0x07fffffe; bitset_word_t bits3 = 0x07fffffe;
if (BITSET_WORD_BITS == 64) if (BITSET_WORD_BITS == 64)
{ {
/* Pacify gcc -Woverflow on 32-bit platformns. */
dfa->word_char[0] = bits1 << 31 << 1 | bits0; dfa->word_char[0] = bits1 << 31 << 1 | bits0;
dfa->word_char[1] = bits3 << 31 << 1 | bits2; dfa->word_char[1] = bits3 << 31 << 1 | bits2;
i = 2; i = 2;