summaryrefslogtreecommitdiff
path: root/libiberty/regex.c
diff options
context:
space:
mode:
authordj <dj@138bc75d-0d04-0410-961f-82ee72b054a4>2001-08-13 02:23:00 +0000
committerdj <dj@138bc75d-0d04-0410-961f-82ee72b054a4>2001-08-13 02:23:00 +0000
commit458e9fd00c029706b40b42ed9b33f1d2785282d2 (patch)
tree737b395d84f9be3f6ae967d1d371624ce3b90f5c /libiberty/regex.c
parentaa40f56162c529feae5e13986bf6c46cf9b39245 (diff)
downloadgcc-458e9fd00c029706b40b42ed9b33f1d2785282d2.tar.gz
Merge from libc:
* regex.c (wcs_regex_compile): Use appropriate string to compare with collating element. Fix the padding for the alignment. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44838 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libiberty/regex.c')
-rw-r--r--libiberty/regex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libiberty/regex.c b/libiberty/regex.c
index 555d3bbf66a..f22047caa03 100644
--- a/libiberty/regex.c
+++ b/libiberty/regex.c
@@ -3059,7 +3059,7 @@ PREFIX(regex_compile) (ARG_PREFIX(pattern), ARG_PREFIX(size), syntax, bufp)
/* First compare the hashing value. */
if (symb_table[2 * elem] == hash
&& c1 == extra[symb_table[2 * elem + 1]]
- && memcmp (str,
+ && memcmp (char_str,
&extra[symb_table[2 * elem + 1]
+ 1], c1) == 0)
{
@@ -3079,7 +3079,7 @@ PREFIX(regex_compile) (ARG_PREFIX(pattern), ARG_PREFIX(size), syntax, bufp)
in the table. */
idx += 1 + extra[idx];
/* Adjust for the alignment. */
- idx = (idx + 3) & ~4;
+ idx = (idx + 3) & ~3;
str[0] = (wchar_t) idx + 4;
}