diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-08 20:11:37 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-08 20:11:37 +0000 |
commit | e23a564ac67681946802121caba056805cc658ff (patch) | |
tree | 7edd6e4ffa9754cf100e631b2a3a47a55ce413fc /io.c | |
parent | 055c3336bea2af9dbf464734a9abc12c8bf4d42d (diff) |
revert r54041. it breaks openssl tests.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -2483,7 +2483,7 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock, int no_exception) long n, len; struct read_internal_arg arg; - rb_scan_args(argc, argv, "11", &length, &str); + rb_scan_args(argc, argv, "11:", &length, &str, NULL); if ((len = NUM2LONG(length)) < 0) { rb_raise(rb_eArgError, "negative length %ld given", len); @@ -2675,10 +2675,8 @@ io_read_nonblock(int argc, VALUE *argv, VALUE io) rb_scan_args(argc, argv, "11:", NULL, NULL, &opts); - if (!NIL_P(opts) && Qfalse == get_kwargs_exception(opts)) { + if (!NIL_P(opts) && Qfalse == get_kwargs_exception(opts)) no_exception = 1; - argc--; - } ret = io_getpartial(argc, argv, io, 1, no_exception); |