Mercurial > emacs
changeset 90764:324e371fbbe5
(GET_CHAR_BEFORE_2, GET_CHAR_AFTER): Check the variable
target_multibyte instead of multibyte.
(re_match_2_internal): Call bcmp_translate with target_multibyte.
(bcmp_translate): Change the argument name from multibyte to
target_multibyte.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 16 Feb 2007 06:37:28 +0000 |
| parents | 25de48ab62e2 |
| children | bde48639c22d |
| files | src/regex.c |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regex.c Thu Feb 15 11:29:31 2007 +0000 +++ b/src/regex.c Fri Feb 16 06:37:28 2007 +0000 @@ -162,7 +162,7 @@ (which ends at END1) or STR2 (which ends at END2). */ # define GET_CHAR_BEFORE_2(c, p, str1, end1, str2, end2) \ do { \ - if (multibyte) \ + if (target_multibyte) \ { \ re_char *dtemp = (p) == (str2) ? (end1) : (p); \ re_char *dlimit = ((p) > (str2) && (p) <= (end2)) ? (str2) : (str1); \ @@ -180,7 +180,7 @@ LEN to the byte length of that character. */ # define GET_CHAR_AFTER(c, p, len) \ do { \ - if (multibyte) \ + if (target_multibyte) \ (c) = STRING_CHAR_AND_LENGTH (p, 0, len); \ else \ { \ @@ -5816,7 +5816,7 @@ /* Compare that many; failure if mismatch, else move past them. */ if (RE_TRANSLATE_P (translate) - ? bcmp_translate (d, d2, mcnt, translate, multibyte) + ? bcmp_translate (d, d2, mcnt, translate, target_multibyte) : memcmp (d, d2, mcnt)) { d = dfail; @@ -6437,11 +6437,11 @@ bytes; nonzero otherwise. */ static int -bcmp_translate (s1, s2, len, translate, multibyte) +bcmp_translate (s1, s2, len, translate, target_multibyte) re_char *s1, *s2; register int len; RE_TRANSLATE_TYPE translate; - const int multibyte; + const int target_multibyte; { register re_char *p1 = s1, *p2 = s2; re_char *p1_end = s1 + len;