summaryrefslogtreecommitdiffstats
path: root/transcode.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-15 14:38:12 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-15 14:38:12 +0000
commit854020c3e0678b9d531d27ea46472956684d4ffe (patch)
treec1dc872bf08069ca4e995fcd5de3314e3d444947 /transcode.c
parentf3e8d4994b7bd78b9b8dd2b68fa58a55d758c688 (diff)
downloadruby-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
Diffstat (limited to 'transcode.c')
-rw-r--r--transcode.c6
1 files changed, 4 insertions, 2 deletions
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);