akr	2008-09-15 23:29:09 +0900 (Mon, 15 Sep 2008)

  New Revision: 19362

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19362

  Log:
    * encoding.c (rb_enc_get_index): don't return -1.
    
    * io.c (rb_scan_open_args): call FilePathValue before encoding
      conversion.

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c
    trunk/io.c

Index: encoding.c
===================================================================
--- encoding.c	(revision 19361)
+++ encoding.c	(revision 19362)
@@ -549,6 +549,7 @@
     VALUE tmp;
 
     switch (BUILTIN_TYPE(obj)) {
+        default:
 	case T_STRING:
 	case T_REGEXP:
 	    i = ENCODING_GET_INLINED(obj);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19361)
+++ ChangeLog	(revision 19362)
@@ -1,3 +1,10 @@
+Mon Sep 15 23:28:28 2008  Tanaka Akira  <akr@f...>
+
+	* encoding.c (rb_enc_get_index): don't return -1.
+
+	* io.c (rb_scan_open_args): call FilePathValue before encoding
+	  conversion.
+
 Mon Sep 15 20:57:00 2008  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* lib/matrix.rb (Matrix#eql?): fixed [ruby-dev:36298].
Index: io.c
===================================================================
--- io.c	(revision 19361)
+++ io.c	(revision 19362)
@@ -4631,6 +4631,7 @@
     opt = pop_last_hash(&argc, &argv);
 
     rb_scan_args(argc, argv, "12", &fname, &vmode, &vperm);
+    FilePathValue(fname);
 #if defined _WIN32 || defined __APPLE__
     {
 	static rb_encoding *fs_encoding;
@@ -4650,7 +4651,6 @@
 	}
     }
 #endif
-    FilePathValue(fname);
  
     rb_io_extract_modeenc(&vmode, opt, &oflags, &fmode, convconfig_p);
 

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