summaryrefslogtreecommitdiff
path: root/transcode.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-12 17:30:07 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-12 17:30:07 +0000
commit41d3a0148637725fc6078b4bdfadae290ff0d39e (patch)
tree3a6fb7c25fd178d17d8bb9836f109c23c8eefdab /transcode.c
parent248acf0025f047a731b6d6967382ce9b7675a05e (diff)
* enc/trans/escape.trans: transcoder name renamed to use underscore.
* transcode.c: follow the renaming. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
-rw-r--r--transcode.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/transcode.c b/transcode.c
index 25b744747c..3dfca27d01 100644
--- a/transcode.c
+++ b/transcode.c
@@ -970,11 +970,11 @@ decorator_names(int ecflags, const char **decorators_ret)
num_decorators = 0;
if (ecflags & ECONV_XML_TEXT_DECORATOR)
- decorators_ret[num_decorators++] = "xml-text-escaped";
+ decorators_ret[num_decorators++] = "xml_text_escape";
if (ecflags & ECONV_XML_ATTR_CONTENT_DECORATOR)
- decorators_ret[num_decorators++] = "xml-attr-content-escaped";
+ decorators_ret[num_decorators++] = "xml_attr_content_escape";
if (ecflags & ECONV_XML_ATTR_QUOTE_DECORATOR)
- decorators_ret[num_decorators++] = "xml-attr-quoted";
+ decorators_ret[num_decorators++] = "xml_attr_quote";
if (ecflags & ECONV_CRLF_NEWLINE_DECORATOR)
decorators_ret[num_decorators++] = "crlf_newline";
@@ -1905,27 +1905,27 @@ econv_description(const char *sname, const char *dname, int ecflags, VALUE mesg)
rb_str_cat2(mesg, " with ");
if (ecflags & ECONV_UNIVERSAL_NEWLINE_DECORATOR) {
rb_str_cat2(mesg, pre); pre = ",";
- rb_str_cat2(mesg, "universal-newline");
+ rb_str_cat2(mesg, "universal_newline");
}
if (ecflags & ECONV_CRLF_NEWLINE_DECORATOR) {
rb_str_cat2(mesg, pre); pre = ",";
- rb_str_cat2(mesg, "CRLF-newline");
+ rb_str_cat2(mesg, "crlf_newline");
}
if (ecflags & ECONV_CR_NEWLINE_DECORATOR) {
rb_str_cat2(mesg, pre); pre = ",";
- rb_str_cat2(mesg, "CR-newline");
+ rb_str_cat2(mesg, "cr_newline");
}
if (ecflags & ECONV_XML_TEXT_DECORATOR) {
rb_str_cat2(mesg, pre); pre = ",";
- rb_str_cat2(mesg, "XML-text");
+ rb_str_cat2(mesg, "xml_text");
}
if (ecflags & ECONV_XML_ATTR_CONTENT_DECORATOR) {
rb_str_cat2(mesg, pre); pre = ",";
- rb_str_cat2(mesg, "XML-attr-content");
+ rb_str_cat2(mesg, "xml_attr_content");
}
if (ecflags & ECONV_XML_ATTR_QUOTE_DECORATOR) {
rb_str_cat2(mesg, pre); pre = ",";
- rb_str_cat2(mesg, "XML-attr-quote");
+ rb_str_cat2(mesg, "xml_attr_quote");
}
has_description = 1;
}