akr	2008-09-09 04:01:00 +0900 (Tue, 09 Sep 2008)

  New Revision: 19263

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

  Log:
    * io.c (make_writeconv): useless branch removed.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19262)
+++ ChangeLog	(revision 19263)
@@ -1,3 +1,7 @@
+Tue Sep  9 03:59:13 2008  Tanaka Akira  <akr@f...>
+
+	* io.c (make_writeconv): useless branch removed.
+
 Tue Sep  9 02:18:20 2008  Tanaka Akira  <akr@f...>
 
 	* include/ruby/encoding.h (rb_econv_decorate_at_first): declared.
Index: io.c
===================================================================
--- io.c	(revision 19262)
+++ io.c	(revision 19263)
@@ -729,14 +729,6 @@
                     denc = enc->name;
                     fptr->writeconv_stateless = rb_str_new2(senc);
                 }
-                else if ((fptr->encs.ecflags & ECONV_STATEFUL_ENCODER_MASK) && !rb_enc_asciicompat(enc)) {
-                    /* xxx: stateful encoder works for ASCII compatible encoding.
-                     * So we need to choose an encoding which is ASCII compatible and superset of enc.
-                     * For encodings which is superset of UTF-8, UTF-8 is not appropriate choice.  */
-                    senc = "UTF-8";
-                    denc = enc->name;
-                    fptr->writeconv_stateless = rb_str_new2("UTF-8");
-                }
                 else {
                     senc = denc = "";
                     fptr->writeconv_stateless = rb_str_new2(enc->name);

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