From cc410b2a5cb8edcec2d18bee534d8d2f72aecfd4 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 2 Feb 2018 05:44:13 +0000 Subject: io.c: hoisted out io_fd_check_closed git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- io.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'io.c') diff --git a/io.c b/io.c index a1158a2b86..abbedfd45b 100644 --- a/io.c +++ b/io.c @@ -610,6 +610,14 @@ is_socket(int fd, VALUE path) 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 rb_eof_error(void) { @@ -635,9 +643,7 @@ void rb_io_check_closed(rb_io_t *fptr) { rb_io_check_initialized(fptr); - if (fptr->fd < 0) { - rb_raise(rb_eIOError, closed_stream); - } + io_fd_check_closed(fptr->fd); } static rb_io_t * @@ -1099,9 +1105,7 @@ io_fflush(rb_io_t *fptr) int rb_io_wait_readable(int f) { - if (f < 0) { - rb_raise(rb_eIOError, closed_stream); - } + io_fd_check_closed(f); switch (errno) { case EINTR: #if defined(ERESTART) @@ -1125,9 +1129,7 @@ rb_io_wait_readable(int f) int rb_io_wait_writable(int f) { - if (f < 0) { - rb_raise(rb_eIOError, closed_stream); - } + io_fd_check_closed(f); switch (errno) { case EINTR: #if defined(ERESTART) -- cgit v1.2.3