diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-24 03:22:43 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-24 03:22:43 +0000 |
commit | bc0efbc9cd875ef4582cfc421297ec7cfbbfcb78 (patch) | |
tree | 47d0543ac4d9a8b5339fa97b17c52eb6d5b7c01f /transcode.c | |
parent | a65d2e05740d6602158dc4fdc2d53ad47cbf45fc (diff) | |
download | ruby-bc0efbc9cd875ef4582cfc421297ec7cfbbfcb78.tar.gz |
* include/ruby/encoding.h (rb_econv_substr_append): renamed from
rb_econv_string.
(rb_econv_str_convert): declared.
(rb_econv_substr_convert): declared.
(rb_econv_str_append): declared.
* io.c (io_fwrite): use rb_econv_str_convert instead of
rb_econv_string.
* transcode.c (rb_econv_substr_append): renamed from rb_econv_string.
(rb_econv_str_append): new function.
(rb_econv_substr_convert): ditto.
(rb_econv_str_convert): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
-rw-r--r-- | transcode.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/transcode.c b/transcode.c index 5e14a358b8..1ba30c8256 100644 --- a/transcode.c +++ b/transcode.c @@ -1327,16 +1327,15 @@ rb_econv_stateless_encoding(const char *stateful_enc) } VALUE -rb_econv_string(rb_econv_t *ec, VALUE src, long off, long len, VALUE dst, int flags) +rb_econv_substr_append(rb_econv_t *ec, VALUE src, long off, long len, VALUE dst, int flags) { unsigned const char *ss, *sp, *se; unsigned char *ds, *dp, *de; rb_econv_result_t res; int max_output; - if (NIL_P(dst)) { + if (NIL_P(dst)) dst = rb_str_buf_new(len); - } if (ec->last_tc) max_output = ec->last_tc->transcoder->max_output; @@ -1367,6 +1366,24 @@ rb_econv_string(rb_econv_t *ec, VALUE src, long off, long len, VALUE dst, int fl return dst; } +VALUE +rb_econv_str_append(rb_econv_t *ec, VALUE src, VALUE dst, int flags) +{ + return rb_econv_substr_append(ec, src, 0, RSTRING_LEN(src), dst, flags); +} + +VALUE +rb_econv_substr_convert(rb_econv_t *ec, VALUE src, long byteoff, long bytesize, int flags) +{ + return rb_econv_substr_append(ec, src, byteoff, bytesize, Qnil, flags); +} + +VALUE +rb_econv_str_convert(rb_econv_t *ec, VALUE src, int flags) +{ + return rb_econv_substr_append(ec, src, 0, RSTRING_LEN(src), Qnil, flags); +} + void rb_econv_binmode(rb_econv_t *ec) { |