diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-15 22:19:05 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-15 22:19:05 +0000 |
commit | cb31e783798438420e33a84a8bfe66acafaa7c4a (patch) | |
tree | abd633cd3da6ebf4155f883b0179866487235998 /ext/socket/socket.c | |
parent | 84a525bc4e47c33c07cc135e6e77df1369375042 (diff) |
* ext/socket/extconf.rb: test struct sockaddr_un and its member,
sun_len.
* ext/socket/sockport.h (INIT_SOCKADDR_UN): new macro defined.
* ext/socket/socket.c (sock_s_pack_sockaddr_un): use INIT_SOCKADDR_UN.
* ext/socket/unixsocket.c (rsock_init_unixsock): ditto.
* ext/socket/raddrinfo.c (init_unix_addrinfo): ditto.
(addrinfo_mload): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/socket.c')
-rw-r--r-- | ext/socket/socket.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 495cae19e4..7e5a8b938e 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -1427,8 +1427,7 @@ sock_s_pack_sockaddr_un(VALUE self, VALUE path) VALUE addr; StringValue(path); - MEMZERO(&sockaddr, struct sockaddr_un, 1); - sockaddr.sun_family = AF_UNIX; + INIT_SOCKADDR_UN(&sockaddr, sizeof(struct sockaddr_un)); if (sizeof(sockaddr.sun_path) < (size_t)RSTRING_LEN(path)) { rb_raise(rb_eArgError, "too long unix socket path (%"PRIuSIZE" bytes given but %"PRIuSIZE" bytes max)", (size_t)RSTRING_LEN(path), sizeof(sockaddr.sun_path)); |