1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* transcode.c (rb_econv_open): needless branch removed.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-09-06 03:44:31 +00:00
parent 073bced367
commit 27e9c48ccc
2 changed files with 4 additions and 6 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:43:55 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (rb_econv_open): needless branch removed.
Sat Sep 6 12:38:34 2008 Tanaka Akira <akr@fsij.org> Sat Sep 6 12:38:34 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (rb_econv_open): test condition simplified. * transcode.c (rb_econv_open): test condition simplified.

6
transcode.c
View File

@ -944,9 +944,6 @@ rb_econv_open(const char *sname, const char *dname, int ecflags)
num_trans++; num_trans++;
num_additional++; num_additional++;
} }
else {
ecflags &= ~(ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER);
}
if (ecflags & ECONV_UNIVERSAL_NEWLINE_DECODER) { if (ecflags & ECONV_UNIVERSAL_NEWLINE_DECODER) {
transcoder_entry_t *e = get_transcoder_entry("universal_newline", ""); transcoder_entry_t *e = get_transcoder_entry("universal_newline", "");
@ -958,9 +955,6 @@ rb_econv_open(const char *sname, const char *dname, int ecflags)
num_additional++; num_additional++;
universal_newline_decoder_added = 1; universal_newline_decoder_added = 1;
} }
else {
ecflags &= ~ECONV_UNIVERSAL_NEWLINE_DECODER;
}
ec = rb_econv_open_by_transcoder_entries(num_trans, entries); ec = rb_econv_open_by_transcoder_entries(num_trans, entries);
xfree(entries); xfree(entries);