naruse	2008-09-17 01:18:32 +0900 (Wed, 17 Sep 2008)

  New Revision: 19388

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

  Log:
    * transcode.c (enc_arg): raise exception when unknown encoding is
      given.

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c
    trunk/version.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19387)
+++ ChangeLog	(revision 19388)
@@ -1,3 +1,8 @@
+Wed Sep 17 01:17:12 2008  NARUSE, Yui  <naruse@r...>
+
+	* transcode.c (enc_arg): raise exception when unknown encoding is
+	  given.
+
 Tue Sep 16 22:23:24 2008  Takeyuki Fujioka  <xibbar@r...>
 
 	* lib/cgi/core.rb (CGI#header): performance improvement. 
Index: version.h
===================================================================
--- version.h	(revision 19387)
+++ version.h	(revision 19388)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-09-16"
+#define RUBY_RELEASE_DATE "2008-09-17"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080916
+#define RUBY_RELEASE_CODE 20080917
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 17
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: transcode.c
===================================================================
--- transcode.c	(revision 19387)
+++ transcode.c	(revision 19388)
@@ -2389,25 +2389,10 @@
 static int
 enc_arg(volatile VALUE *arg, const char **name_p, rb_encoding **enc_p)
 {
-    rb_encoding *enc;
-    const char *n;
-    int encidx;
-    VALUE encval;
-
-    if ((encidx = rb_to_encoding_index(encval = *arg)) < 0) {
-	enc = NULL;
-	encidx = 0;
-	n = StringValueCStr(*arg);
-    }
-    else {
-	enc = rb_enc_from_index(encidx);
-	n = rb_enc_name(enc);
-    }
-
-    *name_p = n;
+    rb_encoding *enc = rb_to_encoding(*arg);
+    *name_p = rb_enc_name(enc);
     *enc_p = enc;
-
-    return encidx;
+    return rb_enc_to_index(enc);
 }
 
 static int

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