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

  New Revision: 19363

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

  Log:
    * transcode.c (econv_opts): don't use to_sym.

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19362)
+++ ChangeLog	(revision 19363)
@@ -1,3 +1,7 @@
+Mon Sep 15 23:37:15 2008  Tanaka Akira  <akr@f...>
+
+	* transcode.c (econv_opts): don't use to_sym.
+
 Mon Sep 15 23:28:28 2008  Tanaka Akira  <akr@f...>
 
 	* encoding.c (rb_enc_get_index): don't return -1.
Index: transcode.c
===================================================================
--- transcode.c	(revision 19362)
+++ transcode.c	(revision 19363)
@@ -2287,16 +2287,18 @@
 
     v = rb_hash_aref(opt, sym_xml);
     if (!NIL_P(v)) {
-        v = rb_convert_type(v, T_SYMBOL, "Symbol", "to_sym");
         if (v==sym_text) {
             ecflags |= ECONV_XML_TEXT_DECORATOR|ECONV_UNDEF_HEX_CHARREF;
         }
         else if (v==sym_attr) {
             ecflags |= ECONV_XML_ATTR_CONTENT_DECORATOR|ECONV_XML_ATTR_QUOTE_DECORATOR|ECONV_UNDEF_HEX_CHARREF;
         }
-        else {
+        else if (TYPE(v) == T_SYMBOL) {
             rb_raise(rb_eArgError, "unexpected value for xml option: %s", rb_id2name(SYM2ID(v)));
         }
+        else {
+            rb_raise(rb_eArgError, "unexpected value for xml option");
+        }
     }
 
     v = rb_hash_aref(opt, sym_universal_newline);

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