akr	2008-09-06 12:44:31 +0900 (Sat, 06 Sep 2008)

  New Revision: 19176

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19176

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

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19175)
+++ ChangeLog	(revision 19176)
@@ -1,3 +1,7 @@
+Sat Sep  6 12:43:55 2008  Tanaka Akira  <akr@f...>
+
+	* transcode.c (rb_econv_open): needless branch removed.
+
 Sat Sep  6 12:38:34 2008  Tanaka Akira  <akr@f...>
 
 	* transcode.c (rb_econv_open): test condition simplified.
Index: transcode.c
===================================================================
--- transcode.c	(revision 19175)
+++ transcode.c	(revision 19176)
@@ -944,9 +944,6 @@
         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 @@
         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);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/