mirror of
https://github.com/ruby/ruby.git
synced 2025-08-23 13:04:13 +02:00
* include/ruby/encoding.h (econv_after_output): renamed from
econv_output_followed_by_input. (ECONV_AFTER_OUTPUT): renamed from ECONV_OUTPUT_FOLLOWED_BY_INPUT. * transcode.c: follow the renaming. * io.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3cc7c9d0dd
commit
2d26208a55
5 changed files with 78 additions and 68 deletions
2
io.c
2
io.c
|
@ -1503,7 +1503,7 @@ more_char(rb_io_t *fptr)
|
|||
se = sp + fptr->rbuf_len;
|
||||
ds = dp = (unsigned char *)fptr->cbuf + fptr->cbuf_off + fptr->cbuf_len;
|
||||
de = (unsigned char *)fptr->cbuf + fptr->cbuf_capa;
|
||||
res = rb_econv_convert(fptr->readconv, &sp, se, &dp, de, ECONV_PARTIAL_INPUT|ECONV_OUTPUT_FOLLOWED_BY_INPUT);
|
||||
res = rb_econv_convert(fptr->readconv, &sp, se, &dp, de, ECONV_PARTIAL_INPUT|ECONV_AFTER_OUTPUT);
|
||||
fptr->rbuf_off += sp - ss;
|
||||
fptr->rbuf_len -= sp - ss;
|
||||
fptr->cbuf_len += dp - ds;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue