From 752e053a1df0446b6ca20815b1976dd322d736bd Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 1 Sep 2008 16:22:49 +0000 Subject: * transcode_data.h (BYTE_LOOKUP): change to uintptr_t array. (BYTE_LOOKUP_BASE): follow the type change. (BYTE_LOOKUP_INFO): ditto. (PType): ditto. (rb_transcoding): ditto. * tool/transcode-tblgen.rb: follow the type change. * transcode.c: ditto. * enc/trans/newline.trans: ditto. * enc/trans/iso2022.trans: ditto. * enc/trans/utf_16_32.trans: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enc/trans/iso2022.trans | 6 +++--- enc/trans/newline.trans | 6 +++--- enc/trans/utf_16_32.trans | 32 ++++++++++++++++---------------- 3 files changed, 22 insertions(+), 22 deletions(-) (limited to 'enc/trans') diff --git a/enc/trans/iso2022.trans b/enc/trans/iso2022.trans index 4340fa9b27..8a94d70040 100644 --- a/enc/trans/iso2022.trans +++ b/enc/trans/iso2022.trans @@ -33,7 +33,7 @@ fun_si_iso2022jp_to_eucjp(rb_transcoding* t, const unsigned char* s, size_t l) if (t->stateful[0] == 0) return (VALUE)NOMAP; else if (0x21 <= s[0] && s[0] <= 0x7e) - return (VALUE)&iso2022jp_to_eucjp_jisx0208_rest; + return (VALUE)iso2022jp_to_eucjp_jisx0208_rest; else return (VALUE)INVALID; } @@ -69,7 +69,7 @@ fun_so_iso2022jp_to_eucjp(rb_transcoding* t, const unsigned char* s, size_t l, u static const rb_transcoder rb_ISO_2022_JP_to_EUC_JP = { - "ISO-2022-JP", "EUC-JP", &iso2022jp_to_eucjp, + "ISO-2022-JP", "EUC-JP", iso2022jp_to_eucjp, 1, /* input_unit_length */ 3, /* max_input */ 3, /* max_output */ @@ -141,7 +141,7 @@ finish_eucjp_to_iso2022jp(rb_transcoding *t, unsigned char *o) static const rb_transcoder rb_EUC_JP_to_ISO_2022_JP = { - "EUC-JP", "ISO-2022-JP", &eucjp_to_iso2022jp, + "EUC-JP", "ISO-2022-JP", eucjp_to_iso2022jp, 1, /* input_unit_length */ 3, /* max_input */ 5, /* max_output */ diff --git a/enc/trans/newline.trans b/enc/trans/newline.trans index 5d6c9bf054..536cba108c 100644 --- a/enc/trans/newline.trans +++ b/enc/trans/newline.trans @@ -54,7 +54,7 @@ fun_so_universal_newline(rb_transcoding* t, const unsigned char* s, size_t l, un static const rb_transcoder rb_universal_newline = { - "universal_newline", "", &universal_newline, + "universal_newline", "", universal_newline, 1, /* input_unit_length */ 1, /* max_input */ 1, /* max_output */ @@ -64,7 +64,7 @@ rb_universal_newline = { static const rb_transcoder rb_crlf_newline = { - "", "crlf_newline", &crlf_newline, + "", "crlf_newline", crlf_newline, 1, /* input_unit_length */ 1, /* max_input */ 2, /* max_output */ @@ -74,7 +74,7 @@ rb_crlf_newline = { static const rb_transcoder rb_cr_newline = { - "", "cr_newline", &cr_newline, + "", "cr_newline", cr_newline, 1, /* input_unit_length */ 1, /* max_input */ 1, /* max_output */ diff --git a/enc/trans/utf_16_32.trans b/enc/trans/utf_16_32.trans index b71c289bae..2bbee65b7f 100644 --- a/enc/trans/utf_16_32.trans +++ b/enc/trans/utf_16_32.trans @@ -261,82 +261,82 @@ fun_so_to_utf_32le(rb_transcoding* t, const unsigned char* s, size_t l, unsigned static const rb_transcoder rb_from_UTF_16BE = { - "UTF-16BE", "UTF-8", &from_UTF_16BE, + "UTF-16BE", "UTF-8", from_UTF_16BE, 2, /* input_unit_length */ 4, /* max_input */ 4, /* max_output */ stateless_converter, /* stateful_type */ - NULL, NULL, NULL, &fun_so_from_utf_16be + NULL, NULL, NULL, fun_so_from_utf_16be }; static const rb_transcoder rb_to_UTF_16BE = { - "UTF-8", "UTF-16BE", &to_UTF_16BE, + "UTF-8", "UTF-16BE", to_UTF_16BE, 1, /* input_unit_length */ 4, /* max_input */ 4, /* max_output */ stateless_converter, /* stateful_type */ - NULL, NULL, NULL, &fun_so_to_utf_16be + NULL, NULL, NULL, fun_so_to_utf_16be }; static const rb_transcoder rb_from_UTF_16LE = { - "UTF-16LE", "UTF-8", &from_UTF_16LE, + "UTF-16LE", "UTF-8", from_UTF_16LE, 2, /* input_unit_length */ 4, /* max_input */ 4, /* max_output */ stateless_converter, /* stateful_type */ - NULL, NULL, NULL, &fun_so_from_utf_16le + NULL, NULL, NULL, fun_so_from_utf_16le }; static const rb_transcoder rb_to_UTF_16LE = { - "UTF-8", "UTF-16LE", &to_UTF_16BE, + "UTF-8", "UTF-16LE", to_UTF_16BE, 1, /* input_unit_length */ 4, /* max_input */ 4, /* max_output */ stateless_converter, /* stateful_type */ - NULL, NULL, NULL, &fun_so_to_utf_16le + NULL, NULL, NULL, fun_so_to_utf_16le }; static const rb_transcoder rb_from_UTF_32BE = { - "UTF-32BE", "UTF-8", &from_UTF_32BE, + "UTF-32BE", "UTF-8", from_UTF_32BE, 4, /* input_unit_length */ 4, /* max_input */ 4, /* max_output */ stateless_converter, /* stateful_type */ - NULL, NULL, NULL, &fun_so_from_utf_32be + NULL, NULL, NULL, fun_so_from_utf_32be }; static const rb_transcoder rb_to_UTF_32BE = { - "UTF-8", "UTF-32BE", &to_UTF_16BE, + "UTF-8", "UTF-32BE", to_UTF_16BE, 1, /* input_unit_length */ 4, /* max_input */ 4, /* max_output */ stateless_converter, /* stateful_type */ - NULL, NULL, NULL, &fun_so_to_utf_32be + NULL, NULL, NULL, fun_so_to_utf_32be }; static const rb_transcoder rb_from_UTF_32LE = { - "UTF-32LE", "UTF-8", &from_UTF_32LE, + "UTF-32LE", "UTF-8", from_UTF_32LE, 4, /* input_unit_length */ 4, /* max_input */ 4, /* max_output */ stateless_converter, /* stateful_type */ - NULL, NULL, NULL, &fun_so_from_utf_32le + NULL, NULL, NULL, fun_so_from_utf_32le }; static const rb_transcoder rb_to_UTF_32LE = { - "UTF-8", "UTF-32LE", &to_UTF_16BE, + "UTF-8", "UTF-32LE", to_UTF_16BE, 1, /* input_unit_length */ 4, /* max_input */ 4, /* max_output */ stateless_converter, /* stateful_type */ - NULL, NULL, NULL, &fun_so_to_utf_32le + NULL, NULL, NULL, fun_so_to_utf_32le }; void -- cgit v1.2.3