diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-18 00:13:52 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-18 00:13:52 +0000 |
commit | ff132bc0f46cf505ee70e17e9948b5288e704d28 (patch) | |
tree | 950412c6ccb7e968651368b72a55e98535f65ce1 /io.c | |
parent | acc94eb9399f56daaa72d1bd98e729c71ad09230 (diff) | |
download | ruby-ff132bc0f46cf505ee70e17e9948b5288e704d28.tar.gz |
Revert r52154
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -4263,7 +4263,6 @@ fptr_finalize(rb_io_t *fptr, int noraise) VALUE err = Qnil; int fd = fptr->fd; FILE *stdio_file = fptr->stdio_file; - int mode = fptr->mode; if (fptr->writeconv) { if (fptr->write_lock && !noraise) { @@ -4304,11 +4303,7 @@ fptr_finalize(rb_io_t *fptr, int noraise) /* fptr->fd may be closed even if close fails. * POSIX doesn't specify it. * We assumes it is closed. */ - - /**/ - int keepgvl = !(mode & FMODE_WRITABLE); - keepgvl |= noraise; - if ((maygvl_close(fd, keepgvl) < 0) && NIL_P(err)) + if ((maygvl_close(fd, noraise) < 0) && NIL_P(err)) err = noraise ? Qtrue : INT2NUM(errno); } |