diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-15 14:38:12 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-15 14:38:12 +0000 |
| commit | 854020c3e0678b9d531d27ea46472956684d4ffe (patch) | |
| tree | c1dc872bf08069ca4e995fcd5de3314e3d444947 | |
| parent | f3e8d4994b7bd78b9b8dd2b68fa58a55d758c688 (diff) | |
| download | ruby-854020c3e0678b9d531d27ea46472956684d4ffe.tar.gz ruby-854020c3e0678b9d531d27ea46472956684d4ffe.tar.xz ruby-854020c3e0678b9d531d27ea46472956684d4ffe.zip | |
* transcode.c (econv_opts): don't use to_sym.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19363 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | transcode.c | 6 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Mon Sep 15 23:37:15 2008 Tanaka Akira <akr@fsij.org> + + * transcode.c (econv_opts): don't use to_sym. + Mon Sep 15 23:28:28 2008 Tanaka Akira <akr@fsij.org> * encoding.c (rb_enc_get_index): don't return -1. diff --git a/transcode.c b/transcode.c index dd75a5e30..e88313342 100644 --- a/transcode.c +++ b/transcode.c @@ -2287,16 +2287,18 @@ econv_opts(VALUE opt) 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); |