1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

io.c: hoisted out io_fd_check_closed

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-02-02 05:44:13 +00:00
parent 7fdb4099cd
commit cc410b2a5c
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
io.c
View File

@ -610,6 +610,14 @@ is_socket(int fd, VALUE path)
static const char closed_stream[] = "closed stream"; static const char closed_stream[] = "closed stream";
static void
io_fd_check_closed(int fd)
{
if (fd < 0) {
rb_raise(rb_eIOError, closed_stream);
}
}
void void
rb_eof_error(void) rb_eof_error(void)
{ {
@ -635,9 +643,7 @@ void
rb_io_check_closed(rb_io_t *fptr) rb_io_check_closed(rb_io_t *fptr)
{ {
rb_io_check_initialized(fptr); rb_io_check_initialized(fptr);
if (fptr->fd < 0) { io_fd_check_closed(fptr->fd);
rb_raise(rb_eIOError, closed_stream);
}
} }
static rb_io_t * static rb_io_t *
@ -1099,9 +1105,7 @@ io_fflush(rb_io_t *fptr)
int int
rb_io_wait_readable(int f) rb_io_wait_readable(int f)
{ {
if (f < 0) { io_fd_check_closed(f);
rb_raise(rb_eIOError, closed_stream);
}
switch (errno) { switch (errno) {
case EINTR: case EINTR:
#if defined(ERESTART) #if defined(ERESTART)
@ -1125,9 +1129,7 @@ rb_io_wait_readable(int f)
int int
rb_io_wait_writable(int f) rb_io_wait_writable(int f)
{ {
if (f < 0) { io_fd_check_closed(f);
rb_raise(rb_eIOError, closed_stream);
}
switch (errno) { switch (errno) {
case EINTR: case EINTR:
#if defined(ERESTART) #if defined(ERESTART)