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 (rb_econv_open): test condition simplified.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19175 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-09-06 03:38:59 +00:00
parent 393f57670f
commit 073bced367
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sat Sep 6 12:38:34 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (rb_econv_open): test condition simplified.
Sat Sep 6 12:25:31 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (stateless_encoding_i): ignore supplemental conversions.

6
transcode.c
View file

@ -928,8 +928,7 @@ rb_econv_open(const char *sname, const char *dname, int ecflags)
return NULL;
}
if ((!*sname || (senc && rb_enc_asciicompat(senc))) &&
(ecflags & (ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER))) {
if (ecflags & (ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER)) {
const char *name = (ecflags & ECONV_CRLF_NEWLINE_ENCODER) ? "crlf_newline" : "cr_newline";
transcoder_entry_t *e = get_transcoder_entry("", name);
if (ecflags & ECONV_CRLF_NEWLINE_ENCODER)
@ -949,8 +948,7 @@ rb_econv_open(const char *sname, const char *dname, int ecflags)
ecflags &= ~(ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER);
}
if ((!*dname || (denc && rb_enc_asciicompat(denc))) &&
(ecflags & ECONV_UNIVERSAL_NEWLINE_DECODER)) {
if (ecflags & ECONV_UNIVERSAL_NEWLINE_DECODER) {
transcoder_entry_t *e = get_transcoder_entry("universal_newline", "");
if (!e) {
xfree(entries);