akr	2008-09-03 23:34:09 +0900 (Wed, 03 Sep 2008)

  New Revision: 19097

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

  Log:
    * transcode.c (rb_transcoding): moved from transcode_data.h.
      (TRANSCODING_READBUF): ditto.
      (TRANSCODING_WRITEBUF): ditto.
      (TRANSCODING_STATE_EMBED_MAX): ditto.
      (TRANSCODING_STATE): ditto.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19096)
+++ ChangeLog	(revision 19097)
@@ -1,3 +1,11 @@
+Wed Sep  3 23:33:09 2008  Tanaka Akira  <akr@f...>
+
+	* transcode.c (rb_transcoding): moved from transcode_data.h.
+	  (TRANSCODING_READBUF): ditto.
+	  (TRANSCODING_WRITEBUF): ditto.
+	  (TRANSCODING_STATE_EMBED_MAX): ditto.
+	  (TRANSCODING_STATE): ditto.
+
 Wed Sep  3 23:03:37 2008  Tanaka Akira  <akr@f...>
 
 	* transcode_data.h (rb_transcoding): remove stateful field.
Index: transcode_data.h
===================================================================
--- transcode_data.h	(revision 19096)
+++ transcode_data.h	(revision 19097)
@@ -64,48 +64,6 @@
 
 typedef struct rb_transcoder rb_transcoder;
 
-/* dynamic structure, one per conversion (similar to iconv_t) */
-/* may carry conversion state (e.g. for iso-2022-jp) */
-typedef struct rb_transcoding {
-    const rb_transcoder *transcoder;
-
-    int flags;
-
-    int resume_position;
-    unsigned int next_table;
-    VALUE next_info;
-    unsigned char next_byte;
-
-    int recognized_len; /* already interpreted */
-    int readagain_len; /* not yet interpreted */
-    union {
-        unsigned char ary[8]; /* max_input <= sizeof(ary) */
-        unsigned char *ptr; /* length: max_input */
-    } readbuf; /* recognized_len + readagain_len used */
-
-    int writebuf_off;
-    int writebuf_len;
-    union {
-        unsigned char ary[8]; /* max_output <= sizeof(ary) */
-        unsigned char *ptr; /* length: max_output */
-    } writebuf;
-
-    void *state; /* opaque data for stateful encoding */
-} rb_transcoding;
-#define TRANSCODING_READBUF(tc) \
-    ((tc)->transcoder->max_input <= sizeof((tc)->readbuf.ary) ? \
-     (tc)->readbuf.ary : \
-     (tc)->readbuf.ptr)
-#define TRANSCODING_WRITEBUF(tc) \
-    ((tc)->transcoder->max_output <= sizeof((tc)->writebuf.ary) ? \
-     (tc)->writebuf.ary : \
-     (tc)->writebuf.ptr)
-#define TRANSCODING_STATE_EMBED_MAX sizeof(void *)
-#define TRANSCODING_STATE(tc) \
-    ((tc)->transcoder->state_size <= sizeof((tc)->state) ? \
-     (void *)&(tc)->state : \
-     (tc)->state)
-
 /* static structure, one per supported encoding pair */
 struct rb_transcoder {
     const char *from_encoding;
Index: transcode.c
===================================================================
--- transcode.c	(revision 19096)
+++ transcode.c	(revision 19097)
@@ -31,6 +31,48 @@
 static VALUE sym_output_followed_by_input;
 static VALUE sym_incomplete_input;
 
+/* dynamic structure, one per conversion (similar to iconv_t) */
+/* may carry conversion state (e.g. for iso-2022-jp) */
+typedef struct rb_transcoding {
+    const rb_transcoder *transcoder;
+
+    int flags;
+
+    int resume_position;
+    unsigned int next_table;
+    VALUE next_info;
+    unsigned char next_byte;
+
+    int recognized_len; /* already interpreted */
+    int readagain_len; /* not yet interpreted */
+    union {
+        unsigned char ary[8]; /* max_input <= sizeof(ary) */
+        unsigned char *ptr; /* length: max_input */
+    } readbuf; /* recognized_len + readagain_len used */
+
+    int writebuf_off;
+    int writebuf_len;
+    union {
+        unsigned char ary[8]; /* max_output <= sizeof(ary) */
+        unsigned char *ptr; /* length: max_output */
+    } writebuf;
+
+    void *state; /* opaque data for stateful encoding */
+} rb_transcoding;
+#define TRANSCODING_READBUF(tc) \
+    ((tc)->transcoder->max_input <= sizeof((tc)->readbuf.ary) ? \
+     (tc)->readbuf.ary : \
+     (tc)->readbuf.ptr)
+#define TRANSCODING_WRITEBUF(tc) \
+    ((tc)->transcoder->max_output <= sizeof((tc)->writebuf.ary) ? \
+     (tc)->writebuf.ary : \
+     (tc)->writebuf.ptr)
+#define TRANSCODING_STATE_EMBED_MAX sizeof(void *)
+#define TRANSCODING_STATE(tc) \
+    ((tc)->transcoder->state_size <= sizeof((tc)->state) ? \
+     (void *)&(tc)->state : \
+     (tc)->state)
+
 typedef struct {
     struct rb_transcoding *tc;
     unsigned char *out_buf_start;

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