summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-28 16:27:42 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-28 16:27:42 +0000
commit6cd74eae6e303857e96e1c363302fd432384a4e1 (patch)
tree6aac2cf91e05e4c74db02561fc3c059dae037139 /io.c
parenta1494176e7f27b32f23cc7309e80101ece99f5a2 (diff)
* io.c (io_close): always calls "close" method of the receiver.
[ruby-core:6911] [ruby-core:8112] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/io.c b/io.c
index 1b9cff03c6..1d34632e3b 100644
--- a/io.c
+++ b/io.c
@@ -2289,16 +2289,19 @@ rb_io_close_m(io)
}
static VALUE
-io_close(io)
+io_call_close(io)
VALUE io;
{
- if (TYPE(io) == T_FILE) {
- rb_io_close(io);
- return Qnil;
- }
return rb_funcall(io, rb_intern("close"), 0, 0);
}
+static VALUE
+io_close(io)
+ VALUE io;
+{
+ return rb_rescue(io_call_close, io, 0, 0);
+}
+
/*
* call-seq:
* ios.closed? => true or false