From a7569aa360319b287098eb17e018492b6bf5a4e6 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 6 Sep 2008 03:38:59 +0000 Subject: * transcode.c (rb_econv_open): test condition simplified. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19175 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- transcode.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'transcode.c') diff --git a/transcode.c b/transcode.c index 5c9e7d826..d77974132 100644 --- a/transcode.c +++ b/transcode.c @@ -928,8 +928,7 @@ rb_econv_open(const char *sname, const char *dname, int ecflags) return NULL; } - if ((!*sname || (senc && rb_enc_asciicompat(senc))) && - (ecflags & (ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER))) { + if (ecflags & (ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER)) { const char *name = (ecflags & ECONV_CRLF_NEWLINE_ENCODER) ? "crlf_newline" : "cr_newline"; transcoder_entry_t *e = get_transcoder_entry("", name); if (ecflags & ECONV_CRLF_NEWLINE_ENCODER) @@ -949,8 +948,7 @@ rb_econv_open(const char *sname, const char *dname, int ecflags) ecflags &= ~(ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER); } - if ((!*dname || (denc && rb_enc_asciicompat(denc))) && - (ecflags & ECONV_UNIVERSAL_NEWLINE_DECODER)) { + if (ecflags & ECONV_UNIVERSAL_NEWLINE_DECODER) { transcoder_entry_t *e = get_transcoder_entry("universal_newline", ""); if (!e) { xfree(entries); -- cgit