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

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 4 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index e67168049..0bb67e8e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* transcode.c (rb_econv_open): test condition simplified.
diff --git a/transcode.c b/transcode.c
index d77974132..5158da3bb 100644
--- a/transcode.c
+++ b/transcode.c
@@ -944,9 +944,6 @@ rb_econv_open(const char *sname, const char *dname, int ecflags)
         num_trans++;
         num_additional++;
     }
-    else {
-        ecflags &= ~(ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER);
-    }
 
     if (ecflags & ECONV_UNIVERSAL_NEWLINE_DECODER) {
         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++;
         universal_newline_decoder_added = 1;
     }
-    else {
-        ecflags &= ~ECONV_UNIVERSAL_NEWLINE_DECODER;
-    }
 
     ec = rb_econv_open_by_transcoder_entries(num_trans, entries);
     xfree(entries);