[前][次][番号順一覧][スレッド一覧]

ruby-changes:7665

From: akr <ko1@a...>
Date: Sat, 6 Sep 2008 19:55:17 +0900 (JST)
Subject: [ruby-changes:7665] Ruby:r19186 (trunk): * transcode.c (rb_econv_open): fix last_tc.

akr	2008-09-06 19:54:59 +0900 (Sat, 06 Sep 2008)

  New Revision: 19186

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

  Log:
    * transcode.c (rb_econv_open): fix last_tc.

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19185)
+++ ChangeLog	(revision 19186)
@@ -1,3 +1,7 @@
+Sat Sep  6 19:54:25 2008  Tanaka Akira  <akr@f...>
+
+	* transcode.c (rb_econv_open): fix last_tc.
+
 Sat Sep  6 19:36:34 2008  Tanaka Akira  <akr@f...>
 
 	* io.c (rb_io_binmode): clear newline flags in writeconv_pre_ecflags.
Index: transcode.c
===================================================================
--- transcode.c	(revision 19185)
+++ transcode.c	(revision 19186)
@@ -880,7 +880,6 @@
     transcoder_entry_t **entries = NULL;
     int num_trans;
     static rb_econv_t *ec;
-    int universal_newline_decoder_added = 0;
 
     rb_encoding *senc, *denc;
     int sidx, didx;
@@ -977,9 +976,9 @@
         ec->last_tc = NULL;
         ec->last_trans_index = -1;
     }
-    else if (universal_newline_decoder_added) {
-        ec->last_tc = ec->elems[ec->num_trans-2].tc;
-        ec->last_trans_index = ec->num_trans-2;
+    else {
+        ec->last_trans_index = ec->num_trans-1-num_decoders;
+        ec->last_tc = ec->elems[ec->last_trans_index].tc;
     }
 
     return ec;

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

[前][次][番号順一覧][スレッド一覧]