aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/regex.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/regex.c b/src/regex.c
index 782f758468f..24574c5e5e8 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -162,7 +162,7 @@
162 (which ends at END1) or STR2 (which ends at END2). */ 162 (which ends at END1) or STR2 (which ends at END2). */
163# define GET_CHAR_BEFORE_2(c, p, str1, end1, str2, end2) \ 163# define GET_CHAR_BEFORE_2(c, p, str1, end1, str2, end2) \
164 do { \ 164 do { \
165 if (multibyte) \ 165 if (target_multibyte) \
166 { \ 166 { \
167 re_char *dtemp = (p) == (str2) ? (end1) : (p); \ 167 re_char *dtemp = (p) == (str2) ? (end1) : (p); \
168 re_char *dlimit = ((p) > (str2) && (p) <= (end2)) ? (str2) : (str1); \ 168 re_char *dlimit = ((p) > (str2) && (p) <= (end2)) ? (str2) : (str1); \
@@ -180,7 +180,7 @@
180 LEN to the byte length of that character. */ 180 LEN to the byte length of that character. */
181# define GET_CHAR_AFTER(c, p, len) \ 181# define GET_CHAR_AFTER(c, p, len) \
182 do { \ 182 do { \
183 if (multibyte) \ 183 if (target_multibyte) \
184 (c) = STRING_CHAR_AND_LENGTH (p, 0, len); \ 184 (c) = STRING_CHAR_AND_LENGTH (p, 0, len); \
185 else \ 185 else \
186 { \ 186 { \
@@ -5816,7 +5816,7 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
5816 /* Compare that many; failure if mismatch, else move 5816 /* Compare that many; failure if mismatch, else move
5817 past them. */ 5817 past them. */
5818 if (RE_TRANSLATE_P (translate) 5818 if (RE_TRANSLATE_P (translate)
5819 ? bcmp_translate (d, d2, mcnt, translate, multibyte) 5819 ? bcmp_translate (d, d2, mcnt, translate, target_multibyte)
5820 : memcmp (d, d2, mcnt)) 5820 : memcmp (d, d2, mcnt))
5821 { 5821 {
5822 d = dfail; 5822 d = dfail;
@@ -6437,11 +6437,11 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
6437 bytes; nonzero otherwise. */ 6437 bytes; nonzero otherwise. */
6438 6438
6439static int 6439static int
6440bcmp_translate (s1, s2, len, translate, multibyte) 6440bcmp_translate (s1, s2, len, translate, target_multibyte)
6441 re_char *s1, *s2; 6441 re_char *s1, *s2;
6442 register int len; 6442 register int len;
6443 RE_TRANSLATE_TYPE translate; 6443 RE_TRANSLATE_TYPE translate;
6444 const int multibyte; 6444 const int target_multibyte;
6445{ 6445{
6446 register re_char *p1 = s1, *p2 = s2; 6446 register re_char *p1 = s1, *p2 = s2;
6447 re_char *p1_end = s1 + len; 6447 re_char *p1_end = s1 + len;