akr	2008-09-06 12:38:59 +0900 (Sat, 06 Sep 2008)

  New Revision: 19175

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

  Log:
    * transcode.c (rb_econv_open): test condition simplified.

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19174)
+++ ChangeLog	(revision 19175)
@@ -1,3 +1,7 @@
+Sat Sep  6 12:38:34 2008  Tanaka Akira  <akr@f...>
+
+	* transcode.c (rb_econv_open): test condition simplified.
+
 Sat Sep  6 12:25:31 2008  Tanaka Akira  <akr@f...>
 
 	* transcode.c (stateless_encoding_i): ignore supplemental conversions.
Index: transcode.c
===================================================================
--- transcode.c	(revision 19174)
+++ transcode.c	(revision 19175)
@@ -928,8 +928,7 @@
         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 @@
         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);

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