archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* io.c (rb_io_s_pipe): reduced nest of rb_ensure of main block.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-01-14 03:35:25 +00:00
parent badd44845e
commit d4beba3f3e
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
io.c
View file

@ -7028,9 +7028,10 @@ io_encoding_set(rb_io_t *fptr, VALUE v1, VALUE v2, VALUE opt)
}
static VALUE
pipe_yield(VALUE rw)
pipe_pair_close(VALUE rw)
{
return rb_ensure(rb_yield, rw, io_close, rb_ary_entry(rw, 1));
VALUE *rwp = (VALUE *)rw;
return rb_ensure(io_close, rwp[0], io_close, rwp[1]);
}
/*
@ -7135,7 +7136,10 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
ret = rb_assoc_new(r, w);
if (rb_block_given_p()) {
return rb_ensure(pipe_yield, ret, io_close, r);
VALUE rw[2];
rw[0] = r;
rw[1] = w;
return rb_ensure(rb_yield, ret, pipe_pair_close, (VALUE)rw);
}
return ret;
}