From c463366dfd75056885028a95e8e2fc6e135d9194 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 29 Jul 2016 11:57:14 +0000 Subject: rb_funcallv * *.c: rename rb_funcall2 to rb_funcallv, except for extensions which are/will be/may be gems. [Fix GH-1406] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55773 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/pathname/pathname.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'ext/pathname') diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index d560e7356f..4fe8859353 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -202,7 +202,7 @@ path_sub(int argc, VALUE *argv, VALUE self) str = rb_block_call(str, rb_intern("sub"), argc, argv, 0, 0); } else { - str = rb_funcall2(str, rb_intern("sub"), argc, argv); + str = rb_funcallv(str, rb_intern("sub"), argc, argv); } return rb_class_new_instance(1, &str, rb_obj_class(self)); } @@ -299,7 +299,7 @@ path_each_line(int argc, VALUE *argv, VALUE self) return rb_block_call(rb_cIO, rb_intern("foreach"), 1+n, args, 0, 0); } else { - return rb_funcall2(rb_cIO, rb_intern("foreach"), 1+n, args); + return rb_funcallv(rb_cIO, rb_intern("foreach"), 1+n, args); } } @@ -321,7 +321,7 @@ path_read(int argc, VALUE *argv, VALUE self) args[0] = get_strpath(self); n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]); - return rb_funcall2(rb_cIO, rb_intern("read"), 1+n, args); + return rb_funcallv(rb_cIO, rb_intern("read"), 1+n, args); } /* @@ -341,7 +341,7 @@ path_binread(int argc, VALUE *argv, VALUE self) args[0] = get_strpath(self); n = rb_scan_args(argc, argv, "02", &args[1], &args[2]); - return rb_funcall2(rb_cIO, rb_intern("binread"), 1+n, args); + return rb_funcallv(rb_cIO, rb_intern("binread"), 1+n, args); } /* @@ -362,7 +362,7 @@ path_write(int argc, VALUE *argv, VALUE self) args[0] = get_strpath(self); n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]); - return rb_funcall2(rb_cIO, rb_intern("write"), 1+n, args); + return rb_funcallv(rb_cIO, rb_intern("write"), 1+n, args); } /* @@ -383,7 +383,7 @@ path_binwrite(int argc, VALUE *argv, VALUE self) args[0] = get_strpath(self); n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]); - return rb_funcall2(rb_cIO, rb_intern("binwrite"), 1+n, args); + return rb_funcallv(rb_cIO, rb_intern("binwrite"), 1+n, args); } /* @@ -405,7 +405,7 @@ path_readlines(int argc, VALUE *argv, VALUE self) args[0] = get_strpath(self); n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]); - return rb_funcall2(rb_cIO, rb_intern("readlines"), 1+n, args); + return rb_funcallv(rb_cIO, rb_intern("readlines"), 1+n, args); } /* @@ -423,7 +423,7 @@ path_sysopen(int argc, VALUE *argv, VALUE self) args[0] = get_strpath(self); n = rb_scan_args(argc, argv, "02", &args[1], &args[2]); - return rb_funcall2(rb_cIO, rb_intern("sysopen"), 1+n, args); + return rb_funcallv(rb_cIO, rb_intern("sysopen"), 1+n, args); } /* @@ -608,7 +608,7 @@ path_open(int argc, VALUE *argv, VALUE self) return rb_block_call(rb_cFile, rb_intern("open"), 1+n, args, 0, 0); } else { - return rb_funcall2(rb_cFile, rb_intern("open"), 1+n, args); + return rb_funcallv(rb_cFile, rb_intern("open"), 1+n, args); } } @@ -1013,7 +1013,7 @@ path_s_glob(int argc, VALUE *argv, VALUE klass) else { VALUE ary; long i; - ary = rb_funcall2(rb_cDir, rb_intern("glob"), n, args); + ary = rb_funcallv(rb_cDir, rb_intern("glob"), n, args); ary = rb_convert_type(ary, T_ARRAY, "Array", "to_ary"); for (i = 0; i < RARRAY_LEN(ary); i++) { VALUE elt = RARRAY_AREF(ary, i); -- cgit v1.2.3