1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/stringio] Use rb_funcallv_kw when delegating arguments

Browse Source 
https://github.com/ruby/stringio/commit/5892663e32
This commit is contained in:
Nobuyoshi Nakada 2019-09-29 18:06:02 +09:00
parent 68ab4a5e35
commit 7fe253f47f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/stringio/stringio.c
View File

@ -26,6 +26,11 @@
# define RB_INTEGER_TYPE_P(c) (FIXNUM_P(c) || RB_TYPE_P(c, T_BIGNUM)) # define RB_INTEGER_TYPE_P(c) (FIXNUM_P(c) || RB_TYPE_P(c, T_BIGNUM))
#endif #endif
#ifndef RB_PASS_CALLED_KEYWORDS
# define rb_funcallv_kw(recv, mid, arg, argv, kw_splat) rb_funcallv(recv, mid, arg, argv)
# define rb_class_new_instance_kw(argc, argv, klass, kw_splat) rb_class_new_instance(argc, argv, klass)
#endif
#ifndef HAVE_RB_IO_EXTRACT_MODEENC #ifndef HAVE_RB_IO_EXTRACT_MODEENC
#define rb_io_extract_modeenc strio_extract_modeenc #define rb_io_extract_modeenc strio_extract_modeenc
static void static void
@ -1309,7 +1314,7 @@ strio_gets(int argc, VALUE *argv, VALUE self)
static VALUE static VALUE
strio_readline(int argc, VALUE *argv, VALUE self) strio_readline(int argc, VALUE *argv, VALUE self)
{ {
VALUE line = rb_funcallv(self, rb_intern("gets"), argc, argv); VALUE line = rb_funcallv_kw(self, rb_intern("gets"), argc, argv, RB_PASS_CALLED_KEYWORDS);
if (NIL_P(line)) rb_eof_error(); if (NIL_P(line)) rb_eof_error();
return line; return line;
} }
@ -1589,7 +1594,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
static VALUE static VALUE
strio_sysread(int argc, VALUE *argv, VALUE self) strio_sysread(int argc, VALUE *argv, VALUE self)
{ {
VALUE val = rb_funcallv(self, rb_intern("read"), argc, argv); VALUE val = rb_funcallv_kw(self, rb_intern("read"), argc, argv, RB_PASS_CALLED_KEYWORDS);
if (NIL_P(val)) { if (NIL_P(val)) {
rb_eof_error(); rb_eof_error();
} }