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 /transcode.c | |
| parent | 158284ac24c4f2402dadc11851058839d451a4d3 (diff) | |
* 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 'transcode.c')
| -rw-r--r-- | transcode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/transcode.c b/transcode.c index 45205dabbd..6280af2257 100644 --- a/transcode.c +++ b/transcode.c @@ -2358,7 +2358,7 @@ rb_econv_open_opts(const char *source_encoding, const char *destination_encoding ret = rb_econv_set_replacement(ec, (const unsigned char *)RSTRING_PTR(replacement), RSTRING_LEN(replacement), - enc->name); + rb_enc_name(enc)); if (ret == -1) { rb_econv_close(ec); return NULL; @@ -2706,8 +2706,8 @@ econv_args(int argc, VALUE *argv, StringValue(*dnamev_p); } - sname = senc ? senc->name : StringValueCStr(*snamev_p); - dname = denc ? denc->name : StringValueCStr(*dnamev_p); + sname = senc ? rb_enc_name(senc) : StringValueCStr(*snamev_p); + dname = denc ? rb_enc_name(denc) : StringValueCStr(*dnamev_p); *sname_p = sname; *dname_p = dname; @@ -2732,8 +2732,8 @@ decorate_convpath(VALUE convpath, int ecflags) len = n = RARRAY_LEN(convpath); if (n != 0) { VALUE pair = RARRAY_PTR(convpath)[n-1]; - const char *sname = rb_to_encoding(RARRAY_PTR(pair)[0])->name; - const char *dname = rb_to_encoding(RARRAY_PTR(pair)[1])->name; + const char *sname = rb_enc_name(rb_to_encoding(RARRAY_PTR(pair)[0])); + const char *dname = rb_enc_name(rb_to_encoding(RARRAY_PTR(pair)[1])); transcoder_entry_t *entry = get_transcoder_entry(sname, dname); const rb_transcoder *tr = load_transcoder_entry(entry); if (!tr) @@ -3736,7 +3736,7 @@ econv_set_replacement(VALUE self, VALUE arg) ret = rb_econv_set_replacement(ec, (const unsigned char *)RSTRING_PTR(string), RSTRING_LEN(string), - enc->name); + rb_enc_name(enc)); if (ret == -1) { /* xxx: rb_eInvalidByteSequence? */ |