diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-15 09:33:59 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-15 09:33:59 +0000 |
| commit | 7f0c5beb6f53cc057c03c74e15468282b1e52cd5 (patch) | |
| tree | 0cb20d42fb041bafac5331dc9528692a8f3b739e /transcode.c | |
| parent | 131e194cec5a36ac18d6c9abcae6aad6ccd5fd1d (diff) | |
| download | ruby-7f0c5beb6f53cc057c03c74e15468282b1e52cd5.tar.gz | |
* include/ruby/encoding.h (rb_econv_t): add error_tc in last_error.
* transcode.c (rb_econv_convert): fill error_tc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18644 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
| -rw-r--r-- | transcode.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/transcode.c b/transcode.c index 92d9ec62fc..a814eb9888 100644 --- a/transcode.c +++ b/transcode.c @@ -950,11 +950,13 @@ rb_econv_convert(rb_econv_t *ec, ec->last_error.partial_input = flags & ECONV_PARTIAL_INPUT; if (res == econv_invalid_byte_sequence || res == econv_undefined_conversion) { - ec->last_error.source_encoding = ec->elems[result_position].tc->transcoder->from_encoding; - ec->last_error.destination_encoding = ec->elems[result_position].tc->transcoder->to_encoding; - ec->last_error.error_bytes_start = TRANSCODING_READBUF(ec->elems[result_position].tc); - ec->last_error.error_bytes_len = ec->elems[result_position].tc->recognized_len; - ec->last_error.readagain_len = ec->elems[result_position].tc->readagain_len; + rb_transcoding *error_tc = ec->elems[result_position].tc; + ec->last_error.error_tc = error_tc; + ec->last_error.source_encoding = error_tc->transcoder->from_encoding; + ec->last_error.destination_encoding = error_tc->transcoder->to_encoding; + ec->last_error.error_bytes_start = TRANSCODING_READBUF(error_tc); + ec->last_error.error_bytes_len = error_tc->recognized_len; + ec->last_error.readagain_len = error_tc->readagain_len; } return res; |