nobu	2007-10-22 11:06:50 +0900 (Mon, 22 Oct 2007)

  New Revision: 13752

  Modified files:
    trunk/encoding.c

  Log:
    * encoding.c (rb_to_encoding_index, rb_to_encoding): commit miss.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=13752&r2=13751

Index: encoding.c
===================================================================
--- encoding.c	(revision 13751)
+++ encoding.c	(revision 13752)
@@ -88,7 +88,7 @@
     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_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));
     }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml