diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/raindrops/linux_inet_diag.c | 4 | ||||
| -rw-r--r-- | ext/raindrops/my_fileno.h | 13 | ||||
| -rw-r--r-- | ext/raindrops/tcp_info.c | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/ext/raindrops/linux_inet_diag.c b/ext/raindrops/linux_inet_diag.c index 2a2360c..e1ae62a 100644 --- a/ext/raindrops/linux_inet_diag.c +++ b/ext/raindrops/linux_inet_diag.c @@ -627,8 +627,8 @@ static VALUE tcp_listener_stats(int argc, VALUE *argv, VALUE self) args.iov[2].iov_len = OPLEN; args.iov[2].iov_base = alloca(page_size); args.table = NULL; - if (NIL_P(sock)) - sock = rb_funcall(cIDSock, id_new, 0); + sock = NIL_P(sock) ? rb_funcall(cIDSock, id_new, 0) + : rb_io_get_io(sock); args.fd = my_fileno(sock); switch (TYPE(addrs)) { diff --git a/ext/raindrops/my_fileno.h b/ext/raindrops/my_fileno.h index 00c5d29..646f31b 100644 --- a/ext/raindrops/my_fileno.h +++ b/ext/raindrops/my_fileno.h @@ -1,22 +1,17 @@ #include <ruby.h> #include <ruby/io.h> +#ifdef HAVE_RB_IO_DESCRIPTOR +# define my_fileno(io) rb_io_descriptor(io) +#else /* Ruby <3.1 */ static int my_fileno(VALUE io) { -#ifdef HAVE_RB_IO_DESCRIPTOR - if (TYPE(io) != T_FILE) - io = rb_convert_type(io, T_FILE, "IO", "to_io"); - - return rb_io_descriptor(io); -#else rb_io_t *fptr; - if (TYPE(io) != T_FILE) - io = rb_convert_type(io, T_FILE, "IO", "to_io"); GetOpenFile(io, fptr); if (fptr->fd < 0) rb_raise(rb_eIOError, "closed stream"); return fptr->fd; -#endif } +#endif /* Ruby <3.1 !HAVE_RB_IO_DESCRIPTOR */ diff --git a/ext/raindrops/tcp_info.c b/ext/raindrops/tcp_info.c index b82f705..c0d34e0 100644 --- a/ext/raindrops/tcp_info.c +++ b/ext/raindrops/tcp_info.c @@ -76,7 +76,7 @@ static VALUE alloc(VALUE klass) */ static VALUE init(VALUE self, VALUE io) { - int fd = my_fileno(io); + int fd = my_fileno(rb_io_get_io(io)); struct tcp_info *info = DATA_PTR(self); socklen_t len = (socklen_t)sizeof(struct tcp_info); int rc = getsockopt(fd, IPPROTO_TCP, TCP_INFO, info, &len); |