From 8bc7d22fb19302f265e40d2a13ecd21d05abb78e Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 13 May 2010 09:20:42 +0000 Subject: [PATCH] merge from trunk (r27782) * io.c (swallow): should use more_char() instead of fill_cbuf(). suggested by akr. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ io.c | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f044918c5e..08cb64fe60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu May 13 18:20:16 2010 NAKAMURA Usaku + + * io.c (swallow): should use more_char() instead of fill_cbuf(). + suggested by akr. + Thu May 13 13:09:24 2010 Nobuyoshi Nakada * vm_core.h (rb_vm_get_sourceline): moved from eval_intern.h for diff --git a/io.c b/io.c index a2cda255d5..9d8d6445f8 100644 --- a/io.c +++ b/io.c @@ -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; }