diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-24 02:42:37 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-24 02:42:37 +0000 |
commit | 8f9ed3c464fea371855792758b9e9d31ba99c0ec (patch) | |
tree | bf7a5e1bc43174638aaedac2b0eb8efe926248b2 /io.c | |
parent | 55742dce2d30534faa95551c7904bbf660b4835b (diff) | |
download | ruby-8f9ed3c464fea371855792758b9e9d31ba99c0ec.tar.gz |
* include/ruby/encoding.h (rb_econv_open_exc): declared.
* transcode.c (rb_eNoConverter): new exception.
(rb_econv_open_exc): new function.
(transcode_loop): use rb_econv_open_exc.
* io.c (make_writeconv): use rb_econv_open_exc.
(make_readconv): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -705,6 +705,8 @@ make_writeconv(rb_io_t *fptr) if (!fptr->enc) { fptr->writeconv = rb_econv_open("", "", ecflags); + if (!fptr->writeconv) + rb_exc_raise(rb_econv_open_exc("", "", ecflags)); fptr->writeconv_stateless = Qnil; return; } @@ -723,7 +725,7 @@ make_writeconv(rb_io_t *fptr) if (senc) { fptr->writeconv = rb_econv_open(senc, denc, ecflags); if (!fptr->writeconv) - rb_raise(rb_eIOError, "code converter open failed (%s to %s)", senc, denc); + rb_exc_raise(rb_econv_open_exc(senc, denc, ecflags)); } else { fptr->writeconv = NULL; @@ -1447,7 +1449,7 @@ make_readconv(rb_io_t *fptr) } fptr->readconv = rb_econv_open(sname, dname, ecflags); if (!fptr->readconv) - rb_raise(rb_eIOError, "code converter open failed (%s to %s)", sname, dname); + rb_exc_raise(rb_econv_open_exc(sname, dname, ecflags)); fptr->crbuf_off = 0; fptr->crbuf_len = 0; fptr->crbuf_capa = 1024; |