From cf5402cace024161b8f53502f4c4def075f0f63c Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 22 Oct 2007 02:06:50 +0000 Subject: * encoding.c (rb_to_encoding_index, rb_to_encoding): commit miss. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- encoding.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/encoding.c b/encoding.c index d088473d6..2c2563ab0 100644 --- a/encoding.c +++ b/encoding.c @@ -88,7 +88,7 @@ rb_to_encoding_index(VALUE enc) if (NIL_P(enc)) return 0; idx = enc_check_encoding(enc); if (idx >= 0) { - return index; + return idx; } else { return rb_enc_find_index(StringValueCStr(enc)); @@ -98,12 +98,11 @@ rb_to_encoding_index(VALUE enc) rb_encoding * rb_to_encoding(VALUE enc) { - rb_encoding *encoding; int idx; if (NIL_P(enc)) return rb_enc_from_index(0); idx = enc_check_encoding(enc); - if (idx >= 0) return RDATA(obj)->data; + if (idx >= 0) return RDATA(enc)->data; if ((idx = rb_enc_find_index(StringValueCStr(enc))) < 0) { rb_raise(rb_eArgError, "unknown encoding name - %s", RSTRING_PTR(enc)); } -- cgit