aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--transcode.c6
2 files changed, 4 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e671680494..0bb67e8e58 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 d779741323..5158da3bba 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);