* transcode_data.h: output function takes output buffer size.

* transcode.c: give output buffer size for 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@19350 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 df4347cda6..d390942c51 100644
--- a/enc/trans/escape.trans
+++ b/enc/trans/escape.trans
@@ -44,7 +44,7 @@ escape_xml_attr_quote_init(void *statep)
 }
 
 static int
-fun_so_escape_xml_attr_quote(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+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;
     int n = 0;
@@ -57,7 +57,7 @@ fun_so_escape_xml_attr_quote(void *statep, const unsigned char *s, size_t l, uns
 }
 
 static int
-escape_xml_attr_quote_finish(void *statep, unsigned char *o)
+escape_xml_attr_quote_finish(void *statep, unsigned char *o, size_t osize)
 {
     unsigned char *sp = statep;
     int n = 0;
diff --git a/enc/trans/iso2022.trans b/enc/trans/iso2022.trans
index f8a9c2c2e1..97a90da810 100644
--- a/enc/trans/iso2022.trans
+++ b/enc/trans/iso2022.trans
@@ -71,7 +71,7 @@ fun_si_iso2022jp_decoder(void *statep, const unsigned char *s, size_t l)
 }
 
 static int
-fun_so_iso2022jp_decoder(void *statep, const unsigned char *s, size_t l, unsigned char* o)
+fun_so_iso2022jp_decoder(void *statep, const unsigned char *s, size_t l, unsigned char* o, size_t osize)
 {
     unsigned char *sp = statep;
     if (s[0] == 0x1b) {
@@ -120,7 +120,7 @@ rb_iso2022jp_decoder = {
 };
 
 static int
-fun_so_iso2022jp_encoder(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+fun_so_iso2022jp_encoder(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     unsigned char *sp = statep;
     unsigned char *output0 = o;
@@ -173,7 +173,7 @@ iso2022jp_encoder_reset_sequence_size(void *statep)
 }
 
 static int
-finish_iso2022jp_encoder(void *statep, unsigned char *o)
+finish_iso2022jp_encoder(void *statep, unsigned char *o, size_t osize)
 {
     unsigned char *sp = statep;
     unsigned char *output0 = o;
@@ -204,7 +204,7 @@ rb_iso2022jp_encoder = {
 };
 
 static int
-fun_so_stateless_iso2022jp_to_eucjp(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+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];
     o[1] = s[2];
@@ -224,7 +224,7 @@ rb_stateless_iso2022jp_to_eucjp = {
 };
 
 static int
-fun_so_eucjp_to_stateless_iso2022jp(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+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;
     o[1] = s[0];
diff --git a/enc/trans/japanese.trans b/enc/trans/japanese.trans
index 12321f587f..4af9b5387c 100644
--- a/enc/trans/japanese.trans
+++ b/enc/trans/japanese.trans
@@ -20,7 +20,7 @@
 <%= transcode_generated_code %>
 
 static int
-fun_so_eucjp2sjis(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+fun_so_eucjp2sjis(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     if (s[0] == 0x8e) {
         o[0] = s[1];
@@ -41,7 +41,7 @@ fun_so_eucjp2sjis(void *statep, const unsigned char *s, size_t l, unsigned char
 }
 
 static int
-fun_so_sjis2eucjp(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+fun_so_sjis2eucjp(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     if (l == 1) {
         o[0] = '\x8e';
diff --git a/enc/trans/newline.trans b/enc/trans/newline.trans
index 14eacd1876..9020b62191 100644
--- a/enc/trans/newline.trans
+++ b/enc/trans/newline.trans
@@ -41,7 +41,7 @@ universal_newline_init(void *statep)
 }
 
 static int
-fun_so_universal_newline(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+fun_so_universal_newline(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     unsigned char *sp = statep;
     int len;
@@ -76,7 +76,7 @@ fun_so_universal_newline(void *statep, const unsigned char *s, size_t l, unsigne
 }
 
 static int
-universal_newline_finish(void *statep, unsigned char *o)
+universal_newline_finish(void *statep, unsigned char *o, size_t osize)
 {
     unsigned char *sp = statep;
     if (STATE == JUST_AFTER_CR)
diff --git a/enc/trans/utf_16_32.trans b/enc/trans/utf_16_32.trans
index 88648266c6..0e0992b6f6 100644
--- a/enc/trans/utf_16_32.trans
+++ b/enc/trans/utf_16_32.trans
@@ -38,7 +38,7 @@
 <%= transcode_generated_code %>
 
 static int
-fun_so_from_utf_16be(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+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) {
         o[0] = s[1];
@@ -66,7 +66,7 @@ fun_so_from_utf_16be(void *statep, const unsigned char *s, size_t l, unsigned ch
 }
 
 static int
-fun_so_to_utf_16be(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+fun_so_to_utf_16be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     if (!(s[0]&0x80)) {
         o[0] = 0x00;
@@ -94,7 +94,7 @@ fun_so_to_utf_16be(void *statep, const unsigned char *s, size_t l, unsigned char
 }
 
 static int
-fun_so_from_utf_16le(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+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) {
         o[0] = s[0];
@@ -122,7 +122,7 @@ fun_so_from_utf_16le(void *statep, const unsigned char *s, size_t l, unsigned ch
 }
 
 static int
-fun_so_to_utf_16le(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+fun_so_to_utf_16le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     if (!(s[0]&0x80)) {
         o[1] = 0x00;
@@ -150,7 +150,7 @@ fun_so_to_utf_16le(void *statep, const unsigned char *s, size_t l, unsigned char
 }
 
 static int
-fun_so_from_utf_32be(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+fun_so_from_utf_32be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     if (!s[1]) {
         if (s[2]==0 && s[3]<0x80) {
@@ -179,7 +179,7 @@ fun_so_from_utf_32be(void *statep, const unsigned char *s, size_t l, unsigned ch
 }
 
 static int
-fun_so_to_utf_32be(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+fun_so_to_utf_32be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     o[0] = 0;
     if (!(s[0]&0x80)) {
@@ -205,7 +205,7 @@ fun_so_to_utf_32be(void *statep, const unsigned char *s, size_t l, unsigned char
 }
 
 static int
-fun_so_from_utf_32le(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+fun_so_from_utf_32le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     if (!s[2]) {
         if (s[1]==0 && s[0]<0x80) {
@@ -234,7 +234,7 @@ fun_so_from_utf_32le(void *statep, const unsigned char *s, size_t l, unsigned ch
 }
 
 static int
-fun_so_to_utf_32le(void *statep, const unsigned char *s, size_t l, unsigned char *o)
+fun_so_to_utf_32le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
 {
     o[3] = 0;
     if (!(s[0]&0x80)) {