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

merge from trunk (r27782)

Browse source 
* 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
This commit is contained in:
usa 2010-05-13 09:20:42 +00:00
parent d6b1887dd3
commit 8bc7d22fb1
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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

6
io.c
View file

@ -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;
}