diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-24 17:51:17 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-24 17:51:17 +0000 |
| commit | c89844dbc50c1422774c39b03e0757c91531e586 (patch) | |
| tree | 6b025765ef5e602e8d11c3c83b11ed7d5c9361ea /ext/socket/ancdata.c | |
| parent | ef339580947c7df1281263ccfb99718887e5378d (diff) | |
* ext/socket: define and use union_sockaddr instead of struct
sockaddr_storage for less casts.
* ext/socket/rubysocket.h (union_sockaddr): defined.
* ext/socket/socket.c (sock_accept): use union_sockaddr.
(sock_accept_nonblock): ditto.
(sock_sysaccept): ditto.
(sock_s_getnameinfo): ditto.
* ext/socket/basicsocket.c (bsock_getsockname): ditto.
(bsock_getpeername): ditto.
(bsock_local_address): ditto.
(bsock_remote_address): ditto.
* ext/socket/ancdata.c (bsock_recvmsg_internal): ditto.
* ext/socket/init.c (recvfrom_arg): ditto.
(recvfrom_blocking): ditto.
(rsock_s_recvfrom): ditto.
(rsock_s_recvfrom_nonblock): ditto.
(rsock_getfamily): ditto.
* ext/socket/raddrinfo.c (rb_addrinfo_t): ditto.
(ai_get_afamily): ditto.
(inspect_sockaddr): ditto.
(addrinfo_mdump): ditto.
(addrinfo_mload): ditto.
(addrinfo_getnameinfo): ditto.
(addrinfo_ip_port): ditto.
(extract_in_addr): ditto.
(addrinfo_ipv6_to_ipv4): ditto.
(addrinfo_unix_path): ditto.
* ext/socket/tcpserver.c (tcp_accept): ditto.
(tcp_accept_nonblock): ditto.
(tcp_sysaccept): ditto.
* ext/socket/ipsocket.c (ip_addr): ditto.
(ip_peeraddr): ditto.
(ip_s_getaddress): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39477 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/ancdata.c')
| -rw-r--r-- | ext/socket/ancdata.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 34a6185b9c..0693c24164 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1482,7 +1482,7 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) int request_scm_rights; struct msghdr mh; struct iovec iov; - struct sockaddr_storage namebuf; + union_sockaddr namebuf; char datbuf0[4096], *datbuf; VALUE dat_str = Qnil; VALUE ret; @@ -1571,7 +1571,7 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) memset(&mh, 0, sizeof(mh)); memset(&namebuf, 0, sizeof(namebuf)); - mh.msg_name = (struct sockaddr *)&namebuf; + mh.msg_name = &namebuf.addr; mh.msg_namelen = (socklen_t)sizeof(namebuf); mh.msg_iov = &iov; |