summaryrefslogtreecommitdiff
path: root/ext/socket
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-25 23:33:50 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-25 23:33:50 +0000
commit07e9f122a96c59e97020e077baf382f98582d872 (patch)
tree013a52f425806ecacc7acbeda08d3d1b11234933 /ext/socket
parent6b36e95851a230fd73665ca75d68b126f7b2d6e5 (diff)
* ext/socket/raddrinfo (rsock_unix_sockaddr_len): renamed from
rsock_unixpath_len, because it returns not the length of the path, but the length of a socket address for the path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
-rw-r--r--ext/socket/raddrinfo.c4
-rw-r--r--ext/socket/rubysocket.h2
-rw-r--r--ext/socket/unixsocket.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
index fdc3d4e..79943c7 100644
--- a/ext/socket/raddrinfo.c
+++ b/ext/socket/raddrinfo.c
@@ -443,7 +443,7 @@ rsock_unixaddr(struct sockaddr_un *sockaddr, socklen_t len)
}
socklen_t
-rsock_unixpath_len(VALUE path)
+rsock_unix_sockaddr_len(VALUE path)
{
#ifdef __linux__
if (RSTRING_PTR(path)[0] == '\0') {
@@ -800,7 +800,7 @@ init_unix_addrinfo(rb_addrinfo_t *rai, VALUE path, int socktype)
un.sun_family = AF_UNIX;
memcpy((void*)&un.sun_path, RSTRING_PTR(path), RSTRING_LEN(path));
- len = rsock_unixpath_len(path);
+ len = rsock_unix_sockaddr_len(path);
init_addrinfo(rai, (struct sockaddr *)&un, len,
PF_UNIX, socktype, 0, Qnil, Qnil);
}
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index c27b164..ff91f51 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -240,7 +240,7 @@ int rsock_revlookup_flag(VALUE revlookup, int *norevlookup);
#ifdef HAVE_SYS_UN_H
VALUE rsock_unixpath_str(struct sockaddr_un *sockaddr, socklen_t len);
VALUE rsock_unixaddr(struct sockaddr_un *sockaddr, socklen_t len);
-socklen_t rsock_unixpath_len(VALUE path);
+socklen_t rsock_unix_sockaddr_len(VALUE path);
#endif
int rsock_socket(int domain, int type, int proto);
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c
index e769335..7bc523b 100644
--- a/ext/socket/unixsocket.c
+++ b/ext/socket/unixsocket.c
@@ -46,7 +46,7 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
RSTRING_LEN(path), (int)sizeof(sockaddr.sun_path));
}
memcpy(sockaddr.sun_path, RSTRING_PTR(path), RSTRING_LEN(path));
- sockaddrlen = rsock_unixpath_len(path);
+ sockaddrlen = rsock_unix_sockaddr_len(path);
if (server) {
status = bind(fd, (struct sockaddr*)&sockaddr, sockaddrlen);