From a271126815a16cb94f9b56ea7a629e3df3eee47b Mon Sep 17 00:00:00 2001 From: nagai Date: Fri, 30 Jul 2004 07:13:55 +0000 Subject: * ext/tcltklib/tcltklib.c(lib_fromUTF8_core): raise ArgumentError when the unknown encoding name is given. * ext/tcltklib/tcltklib.c(lib_toUTF8_core): ditto. * ext/tk/lib/tk.rb(Tk::Encoding.encoding_convertfrom): bug fix. * ext/tk/lib/tk.rb(Tk::Encoding.encoding_convertto): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6721 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/tcltklib/tcltklib.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'ext/tcltklib') diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c index adbe151f5..2792e5338 100644 --- a/ext/tcltklib/tcltklib.c +++ b/ext/tcltklib/tcltklib.c @@ -3524,7 +3524,12 @@ lib_toUTF8_core(ip_obj, src, encodename) StringValue(encodename); encoding = Tcl_GetEncoding(interp, RSTRING(encodename)->ptr); if (encoding == (Tcl_Encoding)NULL) { - rb_warning("unknown encoding name '%s'", RSTRING(encodename)->ptr); + /* + rb_warning("unknown encoding name '%s'", + RSTRING(encodename)->ptr); + */ + rb_raise(rb_eArgError, "unknown encoding name '%s'", + RSTRING(encodename)->ptr); } } @@ -3667,8 +3672,13 @@ lib_fromUTF8_core(ip_obj, src, encodename) encoding = Tcl_GetEncoding(interp, RSTRING(encodename)->ptr); if (encoding == (Tcl_Encoding)NULL) { - rb_warning("unknown encoding name '%s'", RSTRING(encodename)->ptr); + /* + rb_warning("unknown encoding name '%s'", + RSTRING(encodename)->ptr); encodename = Qnil; + */ + rb_raise(rb_eArgError, "unknown encoding name '%s'", + RSTRING(encodename)->ptr); } } -- cgit