summaryrefslogtreecommitdiffstats
path: root/proc.c
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-31 16:02:18 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-31 16:02:18 +0000
commitce56aae6bf9e5e75cc7101a89275334eb3874769 (patch)
tree3286f6e18603a8949329fcf3576390faf6c3022c /proc.c
parent4d5991bac2e65e1619f80115af8d0ed039a9e833 (diff)
downloadruby-ce56aae6bf9e5e75cc7101a89275334eb3874769.tar.gz
ruby-ce56aae6bf9e5e75cc7101a89275334eb3874769.tar.xz
ruby-ce56aae6bf9e5e75cc7101a89275334eb3874769.zip
* 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
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c7
1 files changed, 5 insertions, 2 deletions
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);
}
/*