kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (MORE_CHAR_SUSPENDED): renamed from MORE_CHAR_CBUF_FULL.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-11-18 15:47:41 +00:00
parent 1e7f2caa1f
commit 973841cb73
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu Nov 19 00:47:09 2009 Tanaka Akira <akr@fsij.org>
* io.c (MORE_CHAR_SUSPENDED): renamed from MORE_CHAR_CBUF_FULL.
Wed Nov 18 22:00:13 2009 Tanaka Akira <akr@fsij.org> Wed Nov 18 22:00:13 2009 Tanaka Akira <akr@fsij.org>
* io.c (fill_cbuf): extracted from more_char. * io.c (fill_cbuf): extracted from more_char.

10
io.c
View file

@ -1582,7 +1582,7 @@ make_readconv(rb_io_t *fptr, int size)
} }
} }
#define MORE_CHAR_CBUF_FULL Qtrue #define MORE_CHAR_SUSPENDED Qtrue
#define MORE_CHAR_FINISHED Qnil #define MORE_CHAR_FINISHED Qnil
static VALUE static VALUE
fill_cbuf(rb_io_t *fptr, int ec_flags) fill_cbuf(rb_io_t *fptr, int ec_flags)
@ -1597,7 +1597,7 @@ fill_cbuf(rb_io_t *fptr, int ec_flags)
ec_flags |= ECONV_PARTIAL_INPUT; ec_flags |= ECONV_PARTIAL_INPUT;
if (fptr->cbuf_len == fptr->cbuf_capa) if (fptr->cbuf_len == fptr->cbuf_capa)
return MORE_CHAR_CBUF_FULL; /* cbuf full */ return MORE_CHAR_SUSPENDED; /* cbuf full */
if (fptr->cbuf_len == 0) if (fptr->cbuf_len == 0)
fptr->cbuf_off = 0; fptr->cbuf_off = 0;
else if (fptr->cbuf_off + fptr->cbuf_len == fptr->cbuf_capa) { else if (fptr->cbuf_off + fptr->cbuf_len == fptr->cbuf_capa) {
@ -1629,7 +1629,7 @@ fill_cbuf(rb_io_t *fptr, int ec_flags)
return exc; return exc;
if (cbuf_len0 != fptr->cbuf_len) if (cbuf_len0 != fptr->cbuf_len)
return MORE_CHAR_CBUF_FULL; return MORE_CHAR_SUSPENDED;
if (res == econv_finished) { if (res == econv_finished) {
return MORE_CHAR_FINISHED; return MORE_CHAR_FINISHED;
@ -1656,7 +1656,7 @@ more_char(rb_io_t *fptr)
{ {
VALUE v; VALUE v;
v = fill_cbuf(fptr, ECONV_AFTER_OUTPUT); v = fill_cbuf(fptr, ECONV_AFTER_OUTPUT);
if (v != MORE_CHAR_CBUF_FULL && v != MORE_CHAR_FINISHED) if (v != MORE_CHAR_SUSPENDED && v != MORE_CHAR_FINISHED)
rb_exc_raise(v); rb_exc_raise(v);
return v; return v;
} }
@ -1708,7 +1708,7 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
io_shift_cbuf(fptr, fptr->cbuf_len, &str); io_shift_cbuf(fptr, fptr->cbuf_len, &str);
} }
v = fill_cbuf(fptr, 0); v = fill_cbuf(fptr, 0);
if (v != MORE_CHAR_CBUF_FULL && v != MORE_CHAR_FINISHED) { if (v != MORE_CHAR_SUSPENDED && v != MORE_CHAR_FINISHED) {
if (fptr->cbuf_len) { if (fptr->cbuf_len) {
io_shift_cbuf(fptr, fptr->cbuf_len, &str); io_shift_cbuf(fptr, fptr->cbuf_len, &str);
} }