kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

stringio.c: don't raise after close

Browse source 
* ext/stringio/stringio.c (strio_close): don't raise on dobule
  close for consistent to IO#close.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49962 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-03-13 06:04:39 +00:00
parent 89bfc9b70b
commit f75fe0bcc7
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Mar 13 15:04:36 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_close): don't raise on dobule
close for consistent to IO#close.
Fri Mar 13 15:03:20 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Mar 13 15:03:20 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_close_read, rb_io_close_write): don't raise after * io.c (rb_io_close_read, rb_io_close_write): don't raise after

8
ext/stringio/stringio.c
View file

@ -360,8 +360,8 @@ strio_close(VALUE self)
static VALUE static VALUE
strio_close_read(VALUE self) strio_close_read(VALUE self)
{ {
StringIO(self); struct StringIO *ptr = StringIO(self);
if (!READABLE(self)) { if (!(ptr->flags & FMODE_READABLE)) {
rb_raise(rb_eIOError, "closing non-duplex IO for reading"); rb_raise(rb_eIOError, "closing non-duplex IO for reading");
} }
RBASIC(self)->flags &= ~STRIO_READABLE; RBASIC(self)->flags &= ~STRIO_READABLE;
@ -378,8 +378,8 @@ strio_close_read(VALUE self)
static VALUE static VALUE
strio_close_write(VALUE self) strio_close_write(VALUE self)
{ {
StringIO(self); struct StringIO *ptr = StringIO(self);
if (!WRITABLE(self)) { if (!(ptr->flags & FMODE_WRITABLE)) {
rb_raise(rb_eIOError, "closing non-duplex IO for writing"); rb_raise(rb_eIOError, "closing non-duplex IO for writing");
} }
RBASIC(self)->flags &= ~STRIO_WRITABLE; RBASIC(self)->flags &= ~STRIO_WRITABLE;

4
test/stringio/test_stringio.rb
View file

@ -207,7 +207,7 @@ class TestStringIO < Test::Unit::TestCase
f = StringIO.new("") f = StringIO.new("")
f.close_read f.close_read
assert_raise(IOError) { f.read } assert_raise(IOError) { f.read }
assert_raise(IOError) { f.close_read } assert_nothing_raised(IOError) {f.close_read}
f.close f.close
f = StringIO.new("", "w") f = StringIO.new("", "w")
@ -221,7 +221,7 @@ class TestStringIO < Test::Unit::TestCase
f = StringIO.new("") f = StringIO.new("")
f.close_write f.close_write
assert_raise(IOError) { f.write("foo") } assert_raise(IOError) { f.write("foo") }
assert_raise(IOError) { f.close_write } assert_nothing_raised(IOError) {f.close_write}
f.close f.close
f = StringIO.new("", "r") f = StringIO.new("", "r")