From ce56aae6bf9e5e75cc7101a89275334eb3874769 Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 31 Jul 2008 16:02:18 +0000 Subject: * proc.c (rb_proc_call_with_block): reduce comparison. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ proc.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e435b06b2..4e953c965 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Aug 1 01:01:49 2008 Yusuke Endoh + + * proc.c (rb_proc_call_with_block): reduce comparison. + Wed Jul 30 21:08:06 2008 Yusuke Endoh * ext/syck/syck.c (syck_free_parser): fix memory leak by diff --git a/proc.c b/proc.c index 59b3fd3ab..3bcb6cfbc 100644 --- a/proc.c +++ b/proc.c @@ -528,15 +528,18 @@ rb_proc_call(VALUE self, VALUE args) VALUE rb_proc_call_with_block(VALUE self, int argc, VALUE *argv, VALUE pass_procval) { - rb_proc_t *proc, *pass_proc = 0; + rb_proc_t *proc; + rb_block_t *block = 0; GetProcPtr(self, proc); if (!NIL_P(pass_procval)) { + rb_proc_t *pass_proc; GetProcPtr(pass_procval, pass_proc); + block = &pass_proc->block; } return vm_invoke_proc(GET_THREAD(), proc, proc->block.self, - argc, argv, (pass_proc ? &pass_proc->block : 0)); + argc, argv, block); } /* -- cgit