kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* transcode.c (econv_description): show ECONV_HTML_TEXT_ENCODER and

Browse source 
ECONV_HTML_ATTR_ENCODER.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-09-06 11:11:21 +00:00
parent e4b70ffe43
commit ca3148059b
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Sep 6 20:10:48 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (econv_description): show ECONV_HTML_TEXT_ENCODER and
ECONV_HTML_ATTR_ENCODER.
Sat Sep 6 20:06:09 2008 Tanaka Akira <akr@fsij.org> Sat Sep 6 20:06:09 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (rb_econv_binmode): check actual transcoders. * transcode.c (rb_econv_binmode): check actual transcoders.

14
transcode.c
View file

@ -1790,13 +1790,15 @@ econv_description(const char *sname, const char *dname, int ecflags, VALUE mesg)
if (ecflags & (ECONV_UNIVERSAL_NEWLINE_DECODER| if (ecflags & (ECONV_UNIVERSAL_NEWLINE_DECODER|
ECONV_CRLF_NEWLINE_ENCODER| ECONV_CRLF_NEWLINE_ENCODER|
ECONV_CR_NEWLINE_ENCODER)) { ECONV_CR_NEWLINE_ENCODER|
ECONV_HTML_TEXT_ENCODER|
ECONV_HTML_ATTR_ENCODER)) {
const char *pre = ""; const char *pre = "";
if (has_description) if (has_description)
rb_str_cat2(mesg, " with "); rb_str_cat2(mesg, " with ");
if (ecflags & ECONV_UNIVERSAL_NEWLINE_DECODER) { if (ecflags & ECONV_UNIVERSAL_NEWLINE_DECODER) {
rb_str_cat2(mesg, pre); pre = ","; rb_str_cat2(mesg, pre); pre = ",";
rb_str_cat2(mesg, "Universal-newline"); rb_str_cat2(mesg, "universal-newline");
} }
if (ecflags & ECONV_CRLF_NEWLINE_ENCODER) { if (ecflags & ECONV_CRLF_NEWLINE_ENCODER) {
rb_str_cat2(mesg, pre); pre = ","; rb_str_cat2(mesg, pre); pre = ",";
@ -1806,6 +1808,14 @@ econv_description(const char *sname, const char *dname, int ecflags, VALUE mesg)
rb_str_cat2(mesg, pre); pre = ","; rb_str_cat2(mesg, pre); pre = ",";
rb_str_cat2(mesg, "CR-newline"); rb_str_cat2(mesg, "CR-newline");
} }
if (ecflags & ECONV_HTML_TEXT_ENCODER) {
rb_str_cat2(mesg, pre); pre = ",";
rb_str_cat2(mesg, "HTML-text");
}
if (ecflags & ECONV_HTML_ATTR_ENCODER) {
rb_str_cat2(mesg, pre); pre = ",";
rb_str_cat2(mesg, "HTML-attr");
}
has_description = 1; has_description = 1;
} }
if (!has_description) { if (!has_description) {