1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/iconv/iconv.c (rb_str_derive): uses rb_str_subseq() for byte

Browse Source 
length.  [ruby-dev:33653]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-02-08 10:22:15 +00:00
parent 0123f3a922
commit ef816db96f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,4 +1,7 @@
Fri Feb 8 19:19:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Feb 8 19:22:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (rb_str_derive): uses rb_str_subseq() for byte
length. [ruby-dev:33653]
* ext/iconv/iconv.c (iconv_convert): added toidx argument to set * ext/iconv/iconv.c (iconv_convert): added toidx argument to set
encoding of successfully converted string. [ruby-dev:33221] encoding of successfully converted string. [ruby-dev:33221]

2
ext/iconv/iconv.c
View File

@ -319,7 +319,7 @@ rb_str_derive(VALUE str, const char* ptr, int len)
if (NIL_P(str)) if (NIL_P(str))
return rb_str_new(ptr, len); return rb_str_new(ptr, len);
if (RSTRING_PTR(str) + RSTRING_LEN(str) == ptr + len) if (RSTRING_PTR(str) + RSTRING_LEN(str) == ptr + len)
ret = rb_str_substr(str, ptr - RSTRING_PTR(str), len); ret = rb_str_subseq(str, ptr - RSTRING_PTR(str), len);
else else
ret = rb_str_new(ptr, len); ret = rb_str_new(ptr, len);
OBJ_INFECT(ret, str); OBJ_INFECT(ret, str);