diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-13 09:06:51 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-13 09:06:51 +0000 |
commit | 8d7e774f5f505c5be1f86ad090389c93ec7ad668 (patch) | |
tree | 85e9e549f641fc40aeac4feb4c4141d327ba5867 /io.c | |
parent | 158284ac24c4f2402dadc11851058839d451a4d3 (diff) | |
download | ruby-8d7e774f5f505c5be1f86ad090389c93ec7ad668.tar.gz |
* io.c (make_writeconv): use rb_enc_name.
(make_readconv): ditto.
* transcode.c (rb_econv_open_opts): ditto.
(econv_args): ditto.
(decorate_convpath): ditto.
(econv_set_replacement): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19324 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -713,7 +713,7 @@ make_writeconv(rb_io_t *fptr) } else { enc = fptr->encs.enc2 ? fptr->encs.enc2 : fptr->encs.enc; - senc = rb_econv_asciicompat_encoding(enc->name); + senc = rb_econv_asciicompat_encoding(rb_enc_name(enc)); if (!senc && !(fptr->encs.ecflags & ECONV_STATEFUL_DECORATOR_MASK)) { /* single conversion */ fptr->writeconv_pre_ecflags = ecflags; @@ -726,12 +726,12 @@ make_writeconv(rb_io_t *fptr) fptr->writeconv_pre_ecflags = ecflags & ~ECONV_STATEFUL_DECORATOR_MASK; fptr->writeconv_pre_ecopts = ecopts; if (senc) { - denc = enc->name; + denc = rb_enc_name(enc); fptr->writeconv_asciicompat = rb_str_new2(senc); } else { senc = denc = ""; - fptr->writeconv_asciicompat = rb_str_new2(enc->name); + fptr->writeconv_asciicompat = rb_str_new2(rb_enc_name(enc)); } ecflags = fptr->encs.ecflags & (ECONV_ERROR_HANDLER_MASK|ECONV_STATEFUL_DECORATOR_MASK); ecopts = fptr->encs.ecopts; @@ -1469,8 +1469,8 @@ make_readconv(rb_io_t *fptr) if (NEED_NEWLINE_DECORATOR_ON_READ(fptr)) ecflags |= ECONV_UNIVERSAL_NEWLINE_DECORATOR; if (fptr->encs.enc2) { - sname = fptr->encs.enc2->name; - dname = fptr->encs.enc->name; + sname = rb_enc_name(fptr->encs.enc2); + dname = rb_enc_name(fptr->encs.enc); } else { sname = dname = ""; |