From 1f8620ca22d75b1f4487975ed2012a866dca9c3c Mon Sep 17 00:00:00 2001 From: ko1 Date: Sat, 27 Dec 2008 06:26:48 +0000 Subject: * vm_insnhelper.c (vm_yield_with_cfunc): rename parameter name "blockptr" to "blockargptr". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21091 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ vm_insnhelper.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a42cc8d5f..de5322faab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 27 15:23:38 2008 Koichi Sasada + + * vm_insnhelper.c (vm_yield_with_cfunc): rename parameter name + "blockptr" to "blockargptr". + Sat Dec 27 15:15:56 2008 Yuki Sonoda (Yugui) * common.mk (revision.h): ignores failure of file2lastrev. diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 3a13a0774e..5b5e93ef38 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -644,7 +644,7 @@ block_proc_is_lambda(const VALUE procval) static inline VALUE vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block, VALUE self, int argc, const VALUE *argv, - const rb_block_t *blockptr) + const rb_block_t *blockargptr) { NODE *ifunc = (NODE *) block->iseq; VALUE val, arg, blockarg; @@ -660,12 +660,12 @@ vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block, arg = argv[0]; } - if (blockptr) { - if (blockptr->proc) { - blockarg = blockptr->proc; + if (blockargptr) { + if (blockargptr->proc) { + blockarg = blockargptr->proc; } else { - blockarg = vm_make_proc(th, blockptr, rb_cProc); + blockarg = vm_make_proc(th, blockargptr, rb_cProc); } } else { -- cgit v1.2.3