akr	2008-09-10 01:06:54 +0900 (Wed, 10 Sep 2008)

  New Revision: 19276

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

  Log:
    * enc/trans/newline.trans (rb_universal_newline): swap src_encoding
      and dst_encoding.
    
    * transcode.c (rb_econv_decorate_at): call get_transcoder_entry only
      once.
      (rb_econv_binmode): follow universal_newline change.

  Modified files:
    trunk/ChangeLog
    trunk/enc/trans/newline.trans
    trunk/transcode.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19275)
+++ ChangeLog	(revision 19276)
@@ -1,3 +1,12 @@
+Wed Sep 10 01:05:00 2008  Tanaka Akira  <akr@f...>
+
+	* enc/trans/newline.trans (rb_universal_newline): swap src_encoding
+	  and dst_encoding.
+
+	* transcode.c (rb_econv_decorate_at): call get_transcoder_entry only
+	  once.
+	  (rb_econv_binmode): follow universal_newline change.
+
 Wed Sep 10 00:01:36 2008  Tanaka Akira  <akr@f...>
 
 	* include/ruby/io.h (rb_io_t): rename field: writeconv_stateless to
Index: enc/trans/newline.trans
===================================================================
--- enc/trans/newline.trans	(revision 19275)
+++ enc/trans/newline.trans	(revision 19276)
@@ -87,7 +87,7 @@
 
 static const rb_transcoder
 rb_universal_newline = {
-    "universal_newline", "", universal_newline,
+    "", "universal_newline", universal_newline,
     TRANSCODE_TABLE_INFO,
     1, /* input_unit_length */
     1, /* max_input */
@@ -129,4 +129,3 @@
     rb_register_transcoder(&rb_crlf_newline);
     rb_register_transcoder(&rb_cr_newline);
 }
-
Index: transcode.c
===================================================================
--- transcode.c	(revision 19275)
+++ transcode.c	(revision 19276)
@@ -132,7 +132,7 @@
  *  Dispatch data and logic
  */
 
-#define SUPPLEMENTAL_CONVERSION(sname, dname) (*(sname) == '\0' || *(dname) == '\0')
+#define SUPPLEMENTAL_CONVERSION(sname, dname) (*(sname) == '\0')
 
 typedef struct {
     const char *sname;
@@ -1762,8 +1762,6 @@
 
     entry = get_transcoder_entry("", decorator_name);
     if (!entry)
-        entry = get_transcoder_entry(decorator_name, "");
-    if (!entry)
         return -1;
 
     tr = load_transcoder_entry(entry);
@@ -1833,7 +1831,7 @@
 
     n = 0;
     if (ec->flags & ECONV_UNIVERSAL_NEWLINE_DECORATOR) {
-        entry = get_transcoder_entry("universal_newline", "");
+        entry = get_transcoder_entry("", "universal_newline");
         if (entry->transcoder)
             trs[n++] = entry->transcoder;
     }

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