summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-08 19:01:00 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-08 19:01:00 +0000
commitf98da2e5bdf7dc41e4ccc0fd1ffb249345b72f46 (patch)
treead6ac2d7f1431df371bca8ab19508cfb14055c25
parentbfe5f25dc7f31fad380de6d574416c2da21d4973 (diff)
downloadruby-f98da2e5bdf7dc41e4ccc0fd1ffb249345b72f46.tar.gz
ruby-f98da2e5bdf7dc41e4ccc0fd1ffb249345b72f46.tar.xz
ruby-f98da2e5bdf7dc41e4ccc0fd1ffb249345b72f46.zip
* io.c (make_writeconv): useless branch removed.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c8
2 files changed, 4 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index b1c72d6bc..b691e5c87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 9 03:59:13 2008 Tanaka Akira <akr@fsij.org>
+
+ * io.c (make_writeconv): useless branch removed.
+
Tue Sep 9 02:18:20 2008 Tanaka Akira <akr@fsij.org>
* include/ruby/encoding.h (rb_econv_decorate_at_first): declared.
diff --git a/io.c b/io.c
index d45018615..93447db53 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);