* transcode.c (get_replacement_character): extracted from
output_replacement_character. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c1361132bc
commit
5f9b877ebe
@ -1,3 +1,8 @@
|
|||||||
|
Tue Aug 12 07:19:24 2008 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
|
* transcode.c (get_replacement_character): extracted from
|
||||||
|
output_replacement_character.
|
||||||
|
|
||||||
Tue Aug 12 07:00:02 2008 Tanaka Akira <akr@fsij.org>
|
Tue Aug 12 07:00:02 2008 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* transcode_data.h (rb_transcoder): typedef at first.
|
* transcode_data.h (rb_transcoder): typedef at first.
|
||||||
|
46
transcode.c
46
transcode.c
@ -255,10 +255,9 @@ load_transcoder(transcoder_entry_t *entry)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static const char*
|
||||||
output_replacement_character(unsigned char **out_pp, rb_encoding *enc)
|
get_replacement_character(rb_encoding *enc, int *len_ret)
|
||||||
{
|
{
|
||||||
unsigned char *out_p = *out_pp;
|
|
||||||
static rb_encoding *utf16be_encoding, *utf16le_encoding;
|
static rb_encoding *utf16be_encoding, *utf16le_encoding;
|
||||||
static rb_encoding *utf32be_encoding, *utf32le_encoding;
|
static rb_encoding *utf32be_encoding, *utf32le_encoding;
|
||||||
if (!utf16be_encoding) {
|
if (!utf16be_encoding) {
|
||||||
@ -268,34 +267,41 @@ output_replacement_character(unsigned char **out_pp, rb_encoding *enc)
|
|||||||
utf32le_encoding = rb_enc_find("UTF-32LE");
|
utf32le_encoding = rb_enc_find("UTF-32LE");
|
||||||
}
|
}
|
||||||
if (rb_utf8_encoding() == enc) {
|
if (rb_utf8_encoding() == enc) {
|
||||||
*out_p++ = 0xEF;
|
*len_ret = 3;
|
||||||
*out_p++ = 0xBF;
|
return "\xEF\xBF\xBD";
|
||||||
*out_p++ = 0xBD;
|
|
||||||
}
|
}
|
||||||
else if (utf16be_encoding == enc) {
|
else if (utf16be_encoding == enc) {
|
||||||
*out_p++ = 0xFF;
|
*len_ret = 2;
|
||||||
*out_p++ = 0xFD;
|
return "\xFF\xFD";
|
||||||
}
|
}
|
||||||
else if (utf16le_encoding == enc) {
|
else if (utf16le_encoding == enc) {
|
||||||
*out_p++ = 0xFD;
|
*len_ret = 2;
|
||||||
*out_p++ = 0xFF;
|
return "\xFD\xFF";
|
||||||
}
|
}
|
||||||
else if (utf32be_encoding == enc) {
|
else if (utf32be_encoding == enc) {
|
||||||
*out_p++ = 0x00;
|
*len_ret = 4;
|
||||||
*out_p++ = 0x00;
|
return "\x00\x00\xFF\xFD";
|
||||||
*out_p++ = 0xFF;
|
|
||||||
*out_p++ = 0xFD;
|
|
||||||
}
|
}
|
||||||
else if (utf32le_encoding == enc) {
|
else if (utf32le_encoding == enc) {
|
||||||
*out_p++ = 0xFD;
|
*len_ret = 4;
|
||||||
*out_p++ = 0xFF;
|
return "\xFD\xFF\x00\x00";
|
||||||
*out_p++ = 0x00;
|
|
||||||
*out_p++ = 0x00;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
*out_p++ = '?';
|
*len_ret = 1;
|
||||||
|
return "?";
|
||||||
}
|
}
|
||||||
*out_pp = out_p;
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
output_replacement_character(unsigned char **out_pp, rb_encoding *enc)
|
||||||
|
{
|
||||||
|
const char *replacement;
|
||||||
|
int len;
|
||||||
|
replacement = get_replacement_character(enc, &len);
|
||||||
|
|
||||||
|
memcpy(*out_pp, replacement, len);
|
||||||
|
|
||||||
|
*out_pp += len;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user