* transcode.c (transcode_dispatch): constified return value.

* transcode_data.h (rb_transcoding): include pointer to rb_transcoder
  and auxiliary data.

* transcode_data.h (rb_transcoder): all callback functions shoud have
  their own parameters.

* enc/trans/{japanese,single_byte}.c: constified.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 8 deletions

diff --git a/transcode_data.h b/transcode_data.h
index 8d0c8ccf33..96f5eea7ca 100644
--- a/transcode_data.h
+++ b/transcode_data.h
@@ -59,9 +59,11 @@ typedef struct byte_lookup {
 /* 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;
     VALUE ruby_string_dest; /* the String used as the conversion destination,
 			       or NULL if something else is being converted */
     char *(*flush_func)(struct rb_transcoding*, int, int);
+    VALUE auxiliary_data;
 } rb_transcoding;
 
 /* static structure, one per supported encoding pair */
@@ -71,14 +73,12 @@ typedef struct rb_transcoder {
     const BYTE_LOOKUP *conv_tree_start;
     int max_output;
     int from_utf8;
-    void (*preprocessor)(char**, char**, char*, char*,
-			 struct rb_transcoder *, struct rb_transcoding *);
-    void (*postprocessor)(char**, char**, char*, char*,
-			 struct rb_transcoder *, struct rb_transcoding *);
-    VALUE (*func_ii)(VALUE);                      /* info  -> info   */
-    VALUE (*func_si)(const unsigned char* const); /* start -> info   */
-    int (*func_io)(VALUE, const unsigned char*); /* info  -> output */
-    int (*func_so)(const unsigned char*, unsigned char*); /* start -> output */
+    void (*preprocessor)(char**, char**, char*, char*, struct rb_transcoding *);
+    void (*postprocessor)(char**, char**, char*, char*, struct rb_transcoding *);
+    VALUE (*func_ii)(VALUE, struct rb_transcoding *); /* info  -> info   */
+    VALUE (*func_si)(const char *, struct rb_transcoding *); /* start -> info   */
+    int (*func_io)(VALUE, const char*, struct rb_transcoding *); /* info  -> output */
+    int (*func_so)(const char*, char*, struct rb_transcoding *); /* start -> output */
 } rb_transcoder;
 
 void rb_declare_transcoder(const char *enc1, const char *enc2, const char *lib);