diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-26 10:35:00 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-26 10:35:00 +0000 |
| commit | a3bebd55645e0feac9c03d727e807080e6cd6b4a (patch) | |
| tree | 6d1edf5c76e7e71f6de5cc3b7870c82e99fa492d /io.c | |
| parent | 577e64a874a39ab8a3946660ac50bb3993a7e174 (diff) | |
| download | ruby-a3bebd55645e0feac9c03d727e807080e6cd6b4a.tar.gz | |
* include/ruby/encoding.h (rb_str_encode): renamed from
rb_str_transcode. [ruby-dev:36593]
(rb_econv_has_convpath_p): renamed from rb_transcode_convertible.
* transcode.c: follow the renaming.
* io.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
| -rw-r--r-- | io.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -834,7 +834,7 @@ do_writeconv(VALUE str, rb_io_t *fptr) } if (!NIL_P(common_encoding)) { - str = rb_str_transcode(str, common_encoding, + str = rb_str_encode(str, common_encoding, fptr->writeconv_pre_ecflags, fptr->writeconv_pre_ecopts); } @@ -4683,7 +4683,7 @@ rb_scan_open_args(int argc, VALUE *argv, static VALUE fs_enc; if (!fs_enc) fs_enc = rb_enc_from_encoding(fs_encoding); - fname = rb_str_transcode(fname, fs_enc, 0, Qnil); + fname = rb_str_encode(fname, fs_enc, 0, Qnil); } } #endif |