diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 15:46:26 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 15:46:26 +0000 |
commit | 1cc6f36317558a48ccf05ff5758af0c4cd455b79 (patch) | |
tree | 480b6373144a116e7bd179311222e733b8fdf3b9 | |
parent | 54dc1cf1eda9afac1c43fd21cd077ac216f75730 (diff) |
merge revision(s) 49797: [Backport #10923]
* ext/io/wait/wait.c (io_nread): wrap return value with INT2FIX
Thanks to Yura Sokolov <funny.falcon@gmail.com>
[ruby-core:68369] [Bug#10923]
* test/io/wait/test_io_wait.rb (test_nread_buffered):
fix broken test
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ext/io/wait/wait.c | 2 | ||||
-rw-r--r-- | test/io/wait/test_io_wait.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Mon Apr 13 00:44:12 2015 Eric Wong <e@80x24.org> + + * ext/io/wait/wait.c (io_nread): wrap return value with INT2FIX + Thanks to Yura Sokolov <funny.falcon@gmail.com> + [ruby-core:68369] [Bug#10923] + * test/io/wait/test_io_wait.rb (test_nread_buffered): + fix broken test + Mon Apr 13 00:16:32 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_eval.c (vm_call_super): search next super class from the diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c index 7e17cb2e89..fd32be79b1 100644 --- a/ext/io/wait/wait.c +++ b/ext/io/wait/wait.c @@ -62,7 +62,7 @@ io_nread(VALUE io) GetOpenFile(io, fptr); rb_io_check_readable(fptr); len = rb_io_read_pending(fptr); - if (len > 0) return len; + if (len > 0) return INT2FIX(len); if (!FIONREAD_POSSIBLE_P(fptr->fd)) return INT2FIX(0); if (ioctl(fptr->fd, FIONREAD, &n)) return INT2FIX(0); if (n > 0) return ioctl_arg2num(n); diff --git a/test/io/wait/test_io_wait.rb b/test/io/wait/test_io_wait.rb index 9d883aa821..7729d45526 100644 --- a/test/io/wait/test_io_wait.rb +++ b/test/io/wait/test_io_wait.rb @@ -31,7 +31,7 @@ class TestIOWait < Test::Unit::TestCase def test_nread_buffered @w.syswrite ".\n!" - assert_equal ".\n", @r.read(2) + assert_equal ".\n", @r.gets assert_equal 1, @r.nread end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.2" #define RUBY_RELEASE_DATE "2015-04-13" -#define RUBY_PATCHLEVEL 91 +#define RUBY_PATCHLEVEL 92 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 4 |