* 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

1 files changed, 4 insertions, 2 deletions

diff --git a/io.c b/io.c
index f1fbd6ec7c..15eaba9d93 100644
--- a/io.c
+++ b/io.c
@@ -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;