akr	2008-08-09 15:25:05 +0900 (Sat, 09 Aug 2008)

  New Revision: 18453

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

  Log:
    * transcode.c (transcode_restartable): my_transcoder argument removed.
      (transcode_loop): my_transcoder argument removed.

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18452)
+++ ChangeLog	(revision 18453)
@@ -1,3 +1,8 @@
+Sat Aug  9 15:10:15 2008  Tanaka Akira  <akr@f...>
+
+	* transcode.c (transcode_restartable): my_transcoder argument removed.
+	  (transcode_loop): my_transcoder argument removed.
+
 Sat Aug  9 14:39:34 2008  Tanaka Akira  <akr@f...>
 
 	* transcode_data.h (rb_transcoding): add fields for restartable
Index: transcode.c
===================================================================
--- transcode.c	(revision 18452)
+++ transcode.c	(revision 18453)
@@ -357,11 +357,11 @@
 static transcode_result_t
 transcode_restartable(const unsigned char **in_pos, unsigned char **out_pos,
                       const unsigned char *in_stop, unsigned char *out_stop,
-                      const rb_transcoder *my_transcoder,
                       rb_transcoding *my_transcoding,
                       const int opt)
 
 {
+    const rb_transcoder *my_transcoder = my_transcoding->transcoder;
     int unitlen = my_transcoder->input_unit_length;
 
     const unsigned char *in_p;
@@ -571,10 +571,10 @@
 static void
 transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
 	       const unsigned char *in_stop, unsigned char *out_stop,
-	       const rb_transcoder *my_transcoder,
 	       rb_transcoding *my_transcoding,
 	       const int opt)
 {
+    const rb_transcoder *my_transcoder = my_transcoding->transcoder;
     transcode_result_t ret;
     unsigned char *out_start = *out_pos;
 
@@ -591,7 +591,7 @@
     } while(0)
 
 resume:
-    ret = transcode_restartable(in_pos, out_pos, in_stop, out_stop, my_transcoder, my_transcoding, opt);
+    ret = transcode_restartable(in_pos, out_pos, in_stop, out_stop, my_transcoding, opt);
     if (ret == transcode_invalid_input) {
 	/* deal with invalid byte sequence */
 	/* todo: add more alternative behaviors */
@@ -637,10 +637,10 @@
 static void
 transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
 	       const unsigned char *in_stop, unsigned char *out_stop,
-	       const rb_transcoder *my_transcoder,
 	       rb_transcoding *my_transcoding,
 	       const int opt)
 {
+    const rb_transcoder *my_transcoder = my_transcoding->transcoder;
     transcode_result_t ret;
     unsigned char *out_start = *out_pos;
     const unsigned char *ptr;
@@ -666,14 +666,14 @@
         if (ret == transcode_ibuf_empty) {
             if (ptr < in_stop) {
                 input_byte = *ptr;
-                ret = transcode_restartable(&p, out_pos, p+1, out_stop, my_transcoder, my_transcoding, opt|PARTIAL_INPUT);
+                ret = transcode_restartable(&p, out_pos, p+1, out_stop, my_transcoding, opt|PARTIAL_INPUT);
             }
             else {
-                ret = transcode_restartable(NULL, out_pos, NULL, out_stop, my_transcoder, my_transcoding, opt);
+                ret = transcode_restartable(NULL, out_pos, NULL, out_stop, my_transcoding, opt);
             }
         }
         else {
-            ret = transcode_restartable(NULL, out_pos, NULL, out_stop, my_transcoder, my_transcoding, opt|PARTIAL_INPUT);
+            ret = transcode_restartable(NULL, out_pos, NULL, out_stop, my_transcoding, opt|PARTIAL_INPUT);
         }
         if (&input_byte != p)
             ptr += p - &input_byte;
@@ -846,7 +846,7 @@
 	my_transcoding.ruby_string_dest = dest;
 	my_transcoding.flush_func = str_transcoding_resize;
 
-	transcode_loop(&fromp, &bp, (sp+slen), (bp+blen), my_transcoder, &my_transcoding, options);
+	transcode_loop(&fromp, &bp, (sp+slen), (bp+blen), &my_transcoding, options);
 	if (fromp != sp+slen) {
 	    rb_raise(rb_eArgError, "not fully converted, %"PRIdPTRDIFF" bytes left", sp+slen-fromp);
 	}

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