diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-25 10:01:06 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-25 10:01:06 +0000 |
commit | 0ee5a49dd4ffbbb285c25fa6cba88370ce96ed3e (patch) | |
tree | 589f0a9cbfe3a8e54529d270a4e937c403f996bc /encoding.c | |
parent | 3878b30881f46dab1458e70eaa6272dcff636518 (diff) | |
download | ruby-0ee5a49dd4ffbbb285c25fa6cba88370ce96ed3e.tar.gz |
* encoding.h (rb_enc_mbc_to_codepoint): wrapper for
ONIGENC_MBC_TO_CODE().
* string.c (rb_str_succ): deal with invalid sequence as binary.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r-- | encoding.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/encoding.c b/encoding.c index ee0fdadb39..ea00deb9e2 100644 --- a/encoding.c +++ b/encoding.c @@ -660,14 +660,15 @@ rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc) return c; } -int rb_enc_codepoint(const char *p, const char *e, rb_encoding *enc) +int +rb_enc_codepoint(const char *p, const char *e, rb_encoding *enc) { int r; if (e <= p) rb_raise(rb_eArgError, "empty string"); r = rb_enc_precise_mbclen(p, e, enc); if (MBCLEN_CHARFOUND(r)) - return ONIGENC_MBC_TO_CODE(enc,(UChar*)p,(UChar*)e); + return rb_enc_mbc_to_codepoint(p, e, enc); else rb_raise(rb_eArgError, "invalid mbstring sequence"); } |