diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 6 |
2 files changed, 6 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Thu May 13 18:20:16 2010 NAKAMURA Usaku <usa@ruby-lang.org> + + * io.c (swallow): should use more_char() instead of fill_cbuf(). + suggested by akr. + Thu May 13 13:09:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_core.h (rb_vm_get_sourceline): moved from eval_intern.h for @@ -2296,7 +2296,6 @@ swallow(rb_io_t *fptr, int term) if (NEED_READCONV(fptr)) { rb_encoding *enc = io_read_encoding(fptr); int needconv = rb_enc_mbminlen(enc) != 1; - VALUE v; make_readconv(fptr, 0); do { size_t cnt; @@ -2315,10 +2314,7 @@ swallow(rb_io_t *fptr, int term) } io_shift_cbuf(fptr, (int)cnt - i, NULL); } - v = fill_cbuf(fptr, 0); - if (v != MORE_CHAR_SUSPENDED && v != MORE_CHAR_FINISHED) - rb_exc_raise(v); - } while (v == MORE_CHAR_SUSPENDED); + } while (more_char(fptr) != MORE_CHAR_FINISHED); return FALSE; } |