From c96501058270d16b4be35c0cbc8b008182524da0 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 13 Sep 2008 16:40:31 +0000 Subject: * include/ruby/oniguruma.h (onigenc_get_right_adjust_char_head): add end argument. * include/ruby/encoding.h (rb_enc_right_char_head): add end argument. * regenc.c (onigenc_get_right_adjust_char_head): use end argument. * re.c (rb_reg_adjust_startpos): follow the interface change. * string.c (rb_str_index): ditto. * regexec.c (backward_search_range): ditto. (onig_search): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- regenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'regenc.c') diff --git a/regenc.c b/regenc.c index 935e8d33d1..62bf661525 100644 --- a/regenc.c +++ b/regenc.c @@ -62,11 +62,11 @@ onigenc_mbclen_approximate(const OnigUChar* p,const OnigUChar* e, struct OnigEnc } extern UChar* -onigenc_get_right_adjust_char_head(OnigEncoding enc, const UChar* start, const UChar* s) +onigenc_get_right_adjust_char_head(OnigEncoding enc, const UChar* start, const UChar* s, const UChar* end) { UChar* p = ONIGENC_LEFT_ADJUST_CHAR_HEAD(enc, start, s); if (p < s) { - p += enclen(enc, p, s); + p += enclen(enc, p, end); } return p; } -- cgit v1.2.3