nobu	2008-01-21 14:32:12 +0900 (Mon, 21 Jan 2008)

  New Revision: 15152

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c
    trunk/transcode_data.h

  Log:
    * transcode.c (str_transcode): initialize transcoder in
      rb_transcoding.  [ruby-dev:33234]
    
    * transcode_data.h (rb_transcoding): transcoder constified.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/transcode_data.h?r1=15152&r2=15151&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15152&r2=15151&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/transcode.c?r1=15152&r2=15151&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15151)
+++ ChangeLog	(revision 15152)
@@ -1,3 +1,10 @@
+Mon Jan 21 14:32:10 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* transcode.c (str_transcode): initialize transcoder in
+	  rb_transcoding.  [ruby-dev:33234]
+
+	* transcode_data.h (rb_transcoding): transcoder constified.
+
 Mon Jan 21 12:50:02 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c, gc.c (setjmp): sigsetjmp is a macro on cygwin.
Index: transcode_data.h
===================================================================
--- transcode_data.h	(revision 15151)
+++ transcode_data.h	(revision 15152)
@@ -59,7 +59,7 @@
 /* dynamic structure, one per conversion (similar to iconv_t) */
 /* may carry conversion state (e.g. for iso-2022-jp) */
 typedef struct rb_transcoding {
-    struct rb_transcoder *transcoder;
+    const struct rb_transcoder *transcoder;
     VALUE ruby_string_dest; /* the String used as the conversion destination,
 			       or NULL if something else is being converted */
     unsigned char *(*flush_func)(struct rb_transcoding*, int, int);
Index: transcode.c
===================================================================
--- transcode.c	(revision 15151)
+++ transcode.c	(revision 15152)
@@ -311,6 +311,8 @@
 	return -1;
     }
 
+    my_transcoding.transcoder = my_transcoder;
+
     while (!final_encoding) { /* loop for multistep transcoding */
 	/* later, maybe use smaller intermediate strings for very long strings */
 	if (!(my_transcoder = transcode_dispatch(from_e, to_e))) {

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