From f9adadc5e610360850b3a4bd9a43e928d1c78bb1 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 23 Dec 2015 14:58:47 +0000 Subject: rb_readwrite_syserr_fail * io.c (rb_readwrite_syserr_fail): works with the given errno than thread local errno. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53265 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/ancdata.c | 6 +++--- ext/socket/init.c | 4 ++-- ext/socket/socket.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'ext/socket') diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index b19f605232..02766ba5d2 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1285,8 +1285,8 @@ bsock_sendmsg_internal(VALUE sock, VALUE data, VALUE vflags, if (ex == Qfalse) { return sym_wait_writable; } - rb_readwrite_sys_fail(RB_IO_WAIT_WRITABLE, - "sendmsg(2) would block"); + rb_readwrite_syserr_fail(RB_IO_WAIT_WRITABLE, e, + "sendmsg(2) would block"); } rb_syserr_fail(e, "sendmsg(2)"); } @@ -1559,7 +1559,7 @@ bsock_recvmsg_internal(VALUE sock, if (ex == Qfalse) { return sym_wait_readable; } - rb_readwrite_sys_fail(RB_IO_WAIT_READABLE, "recvmsg(2) would block"); + rb_readwrite_syserr_fail(RB_IO_WAIT_READABLE, e, "recvmsg(2) would block"); } #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) if (!gc_done && (e == EMFILE || e == EMSGSIZE)) { diff --git a/ext/socket/init.c b/ext/socket/init.c index 797e4a185a..1ecd4fe352 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -253,7 +253,7 @@ rsock_s_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str, #endif if (ex == Qfalse) return sym_wait_readable; - rb_readwrite_sys_fail(RB_IO_WAIT_READABLE, "recvfrom(2) would block"); + rb_readwrite_syserr_fail(RB_IO_WAIT_READABLE, e, "recvfrom(2) would block"); } rb_syserr_fail(e, "recvfrom(2)"); } @@ -570,7 +570,7 @@ rsock_s_accept_nonblock(VALUE klass, VALUE ex, rb_io_t *fptr, #endif if (ex == Qfalse) return sym_wait_readable; - rb_readwrite_sys_fail(RB_IO_WAIT_READABLE, "accept(2) would block"); + rb_readwrite_syserr_fail(RB_IO_WAIT_READABLE, e, "accept(2) would block"); } rb_syserr_fail(e, "accept(2)"); } diff --git a/ext/socket/socket.c b/ext/socket/socket.c index d71a94a9a8..dcf2498daa 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -457,7 +457,7 @@ sock_connect_nonblock(VALUE sock, VALUE addr, VALUE ex) if (ex == Qfalse) { return sym_wait_writable; } - rb_readwrite_sys_fail(RB_IO_WAIT_WRITABLE, "connect(2) would block"); + rb_readwrite_syserr_fail(RB_IO_WAIT_WRITABLE, e, "connect(2) would block"); } if (e == EISCONN) { if (ex == Qfalse) { -- cgit v1.2.3