From c5d9a3cc3a012fccf8323c7be55932df122fac98 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 8 Sep 2008 19:01:00 +0000 Subject: * io.c (make_writeconv): useless branch removed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1c72d6bcb..b691e5c87b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Sep 9 03:59:13 2008 Tanaka Akira + + * io.c (make_writeconv): useless branch removed. + Tue Sep 9 02:18:20 2008 Tanaka Akira * include/ruby/encoding.h (rb_econv_decorate_at_first): declared. diff --git a/io.c b/io.c index d45018615b..93447db53b 100644 --- a/io.c +++ b/io.c @@ -729,14 +729,6 @@ make_writeconv(rb_io_t *fptr) 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); -- cgit v1.2.3