* transcode_data.h: return output functions ssize_t.

* transcode.c (transcode_restartable0): don't need to cast the result
  of output functions.

* enc/trans/newline.trans: follow the type change.

* enc/trans/escape.trans: ditto.

* enc/trans/utf_16_32.trans: ditto.

* enc/trans/iso2022.trans: ditto.

* enc/trans/japanese.trans: ditto.



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

5 files changed, 19 insertions, 19 deletions

diff --git a/enc/trans/escape.trans b/enc/trans/escape.trans
index d390942c51..f45f27bc41 100644
--- a/enc/trans/escape.trans
+++ b/enc/trans/escape.trans
@@ -43,7 +43,7 @@ escape_xml_attr_quote_init(void *statep)
     return 0;
 }
 
-static int
+static ssize_t
 fun_so_escape_xml_attr_quote(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     unsigned char *sp = statep;
@@ -56,7 +56,7 @@ fun_so_escape_xml_attr_quote(void *statep, const unsigned char *s, size_t l, uns
     return n;
 }
 
-static int
+static ssize_t
 escape_xml_attr_quote_finish(void *statep, unsigned char *o, size_t osize)
 {
     unsigned char *sp = statep;
diff --git a/enc/trans/iso2022.trans b/enc/trans/iso2022.trans
index 97a90da810..fe9a9b820e 100644
--- a/enc/trans/iso2022.trans
+++ b/enc/trans/iso2022.trans
@@ -70,7 +70,7 @@ fun_si_iso2022jp_decoder(void *statep, const unsigned char *s, size_t l)
         return (VALUE)INVALID;
 }
 
-static int
+static ssize_t
 fun_so_iso2022jp_decoder(void *statep, const unsigned char *s, size_t l, unsigned char* o, size_t osize)
 {
     unsigned char *sp = statep;
@@ -119,7 +119,7 @@ rb_iso2022jp_decoder = {
     NULL, fun_si_iso2022jp_decoder, NULL, fun_so_iso2022jp_decoder
 };
 
-static int
+static ssize_t
 fun_so_iso2022jp_encoder(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     unsigned char *sp = statep;
@@ -172,7 +172,7 @@ iso2022jp_encoder_reset_sequence_size(void *statep)
     return 0;
 }
 
-static int
+static ssize_t
 finish_iso2022jp_encoder(void *statep, unsigned char *o, size_t osize)
 {
     unsigned char *sp = statep;
@@ -203,7 +203,7 @@ rb_iso2022jp_encoder = {
     iso2022jp_encoder_reset_sequence_size, finish_iso2022jp_encoder
 };
 
-static int
+static ssize_t
 fun_so_stateless_iso2022jp_to_eucjp(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     o[0] = s[1];
@@ -223,7 +223,7 @@ rb_stateless_iso2022jp_to_eucjp = {
     NULL, NULL, NULL, fun_so_stateless_iso2022jp_to_eucjp,
 };
 
-static int
+static ssize_t
 fun_so_eucjp_to_stateless_iso2022jp(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     o[0] = EMACS_MULE_LEADING_CODE_JISX0208_1983;
diff --git a/enc/trans/japanese.trans b/enc/trans/japanese.trans
index 4af9b5387c..ce5d0bb70f 100644
--- a/enc/trans/japanese.trans
+++ b/enc/trans/japanese.trans
@@ -19,7 +19,7 @@
 
 <%= transcode_generated_code %>
 
-static int
+static ssize_t
 fun_so_eucjp2sjis(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     if (s[0] == 0x8e) {
@@ -40,7 +40,7 @@ fun_so_eucjp2sjis(void *statep, const unsigned char *s, size_t l, unsigned char
     }
 }
 
-static int
+static ssize_t
 fun_so_sjis2eucjp(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     if (l == 1) {
diff --git a/enc/trans/newline.trans b/enc/trans/newline.trans
index 9020b62191..d62034aa49 100644
--- a/enc/trans/newline.trans
+++ b/enc/trans/newline.trans
@@ -40,7 +40,7 @@ universal_newline_init(void *statep)
     return 0;
 }
 
-static int
+static ssize_t
 fun_so_universal_newline(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     unsigned char *sp = statep;
@@ -75,7 +75,7 @@ fun_so_universal_newline(void *statep, const unsigned char *s, size_t l, unsigne
     return len;
 }
 
-static int
+static ssize_t
 universal_newline_finish(void *statep, unsigned char *o, size_t osize)
 {
     unsigned char *sp = statep;
diff --git a/enc/trans/utf_16_32.trans b/enc/trans/utf_16_32.trans
index 0e0992b6f6..1bf6ed0975 100644
--- a/enc/trans/utf_16_32.trans
+++ b/enc/trans/utf_16_32.trans
@@ -37,7 +37,7 @@
 
 <%= transcode_generated_code %>
 
-static int
+static ssize_t
 fun_so_from_utf_16be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     if (!s[0] && s[1]<0x80) {
@@ -65,7 +65,7 @@ fun_so_from_utf_16be(void *statep, const unsigned char *s, size_t l, unsigned ch
     }
 }
 
-static int
+static ssize_t
 fun_so_to_utf_16be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     if (!(s[0]&0x80)) {
@@ -93,7 +93,7 @@ fun_so_to_utf_16be(void *statep, const unsigned char *s, size_t l, unsigned char
     }
 }
 
-static int
+static ssize_t
 fun_so_from_utf_16le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     if (!s[1] && s[0]<0x80) {
@@ -121,7 +121,7 @@ fun_so_from_utf_16le(void *statep, const unsigned char *s, size_t l, unsigned ch
     }
 }
 
-static int
+static ssize_t
 fun_so_to_utf_16le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     if (!(s[0]&0x80)) {
@@ -149,7 +149,7 @@ fun_so_to_utf_16le(void *statep, const unsigned char *s, size_t l, unsigned char
     }
 }
 
-static int
+static ssize_t
 fun_so_from_utf_32be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     if (!s[1]) {
@@ -178,7 +178,7 @@ fun_so_from_utf_32be(void *statep, const unsigned char *s, size_t l, unsigned ch
     }
 }
 
-static int
+static ssize_t
 fun_so_to_utf_32be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     o[0] = 0;
@@ -204,7 +204,7 @@ fun_so_to_utf_32be(void *statep, const unsigned char *s, size_t l, unsigned char
     return 4;
 }
 
-static int
+static ssize_t
 fun_so_from_utf_32le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     if (!s[2]) {
@@ -233,7 +233,7 @@ fun_so_from_utf_32le(void *statep, const unsigned char *s, size_t l, unsigned ch
     }
 }
 
-static int
+static ssize_t
 fun_so_to_utf_32le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     o[3] = 0;