diff options
| author | DJ Delorie <dj@delorie.com> | 2001-08-13 02:25:01 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2001-08-13 02:25:01 +0000 |
| commit | 0b1ae65391e4754e37f3165d59d09347ceed01ad (patch) | |
| tree | 893fc4178de3cf201b14a85791004648deeb880c | |
| parent | 74ac7ad5da9c246533dc1917954715582946b39f (diff) | |
| download | gdb-0b1ae65391e4754e37f3165d59d09347ceed01ad.tar.gz | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rw-r--r-- | libiberty/regex.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 5c70d68ad3d..ee9da0feee7 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2001-08-12 Isamu Hasegawa <isamu@yamato.ibm.com> + + * regex.c (wcs_regex_compile): Use appropriate string + to compare with collating element. + Fix the padding for the alignment. + 2001-06-13 Andrew Cagney <ac131313@redhat.com> * lbasename.c (lbasename): Change function definition to return a 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; } |