summaryrefslogtreecommitdiffstats
path: root/encoding.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-31 16:29:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-31 16:29:06 +0000
commit29425087b6534100d6bd72c83a8288805565bc40 (patch)
tree089b5f83e967a3d764e39bf6c392e9ce57aca4a2 /encoding.c
parent35812bbb3dfa56e9b85de1dcf9c2a31b7ee8138f (diff)
downloadruby-29425087b6534100d6bd72c83a8288805565bc40.tar.gz
ruby-29425087b6534100d6bd72c83a8288805565bc40.tar.xz
ruby-29425087b6534100d6bd72c83a8288805565bc40.zip
* encoding.c (rb_to_encoding): raises for non-nil, non-encoding,
non-string object. [ruby-core:14634] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r--encoding.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/encoding.c b/encoding.c
index 6f1699e6d..cf044b1cb 100644
--- a/encoding.c
+++ b/encoding.c
@@ -100,9 +100,6 @@ rb_to_encoding(VALUE enc)
if (NIL_P(enc)) return 0;
idx = enc_check_encoding(enc);
if (idx >= 0) return RDATA(enc)->data;
- if (NIL_P(enc = rb_check_string_type(enc))) {
- return 0;
- }
if ((idx = rb_enc_find_index(StringValueCStr(enc))) < 0) {
rb_raise(rb_eArgError, "unknown encoding name - %s", RSTRING_PTR(enc));
}