1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/socket/socket.c (rsock_sys_fail_sockaddr): Takes struct sockaddr

Browse Source 
and socklen_t instead of String object.
  (rsock_sys_fail_addrinfo_or_sockaddr): Follow the above change.

* ext/socket/rubysocket.h (rsock_sys_fail_sockaddr): Follow the above
  change.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-04-06 11:04:45 +00:00
parent c7135ddd2d
commit 67fe038d8f
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Sat Apr 6 19:24:59 2013 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (rsock_sys_fail_sockaddr): Takes struct sockaddr
and socklen_t instead of String object.
(rsock_sys_fail_addrinfo_or_sockaddr): Follow the above change.
* ext/socket/rubysocket.h (rsock_sys_fail_sockaddr): Follow the above
change.
Sat Apr 6 14:28:23 2013 Tanaka Akira <akr@fsij.org> Sat Apr 6 14:28:23 2013 Tanaka Akira <akr@fsij.org>
* ext/socket/rubysocket.h (SockAddrStringValueWithAddrinfo): New macro. * ext/socket/rubysocket.h (SockAddrStringValueWithAddrinfo): New macro.

2
ext/socket/rubysocket.h
View File

@ -342,7 +342,7 @@ void rsock_init_socket_init(void);
NORETURN(void rsock_sys_fail_host_port(const char *, VALUE, VALUE)); NORETURN(void rsock_sys_fail_host_port(const char *, VALUE, VALUE));
NORETURN(void rsock_sys_fail_path(const char *, VALUE)); NORETURN(void rsock_sys_fail_path(const char *, VALUE));
NORETURN(void rsock_sys_fail_sockaddr(const char *, VALUE addr)); NORETURN(void rsock_sys_fail_sockaddr(const char *, struct sockaddr *addr, socklen_t len));
NORETURN(void rsock_sys_fail_addrinfo(const char *, VALUE rai)); NORETURN(void rsock_sys_fail_addrinfo(const char *, VALUE rai));
NORETURN(void rsock_sys_fail_sockaddr_or_addrinfo(const char *, VALUE addr, VALUE rai)); NORETURN(void rsock_sys_fail_sockaddr_or_addrinfo(const char *, VALUE addr, VALUE rai));

15
ext/socket/socket.c
View File

@ -47,14 +47,11 @@ rsock_sys_fail_path(const char *mesg, VALUE path)
} }
void void
rsock_sys_fail_sockaddr(const char *mesg, VALUE addr) rsock_sys_fail_sockaddr(const char *mesg, struct sockaddr *addr, socklen_t len)
{ {
VALUE rai; VALUE rai;
rai = rsock_addrinfo_new( rai = rsock_addrinfo_new(addr, len, PF_UNSPEC, 0, 0, Qnil, Qnil);
(struct sockaddr *)RSTRING_PTR(addr),
(socklen_t)RSTRING_LEN(addr), /* overflow should be checked already */
PF_UNSPEC, 0, 0, Qnil, Qnil);
rsock_sys_fail_addrinfo(mesg, rai); rsock_sys_fail_addrinfo(mesg, rai);
} }
@ -73,8 +70,12 @@ rsock_sys_fail_addrinfo(const char *mesg, VALUE rai)
void void
rsock_sys_fail_addrinfo_or_sockaddr(const char *mesg, VALUE addr, VALUE rai) rsock_sys_fail_addrinfo_or_sockaddr(const char *mesg, VALUE addr, VALUE rai)
{ {
if (NIL_P(rai)) if (NIL_P(rai)) {
rsock_sys_fail_sockaddr(mesg, addr); StringValue(addr);
rsock_sys_fail_sockaddr(mesg,
(struct sockaddr *)RSTRING_PTR(addr),
(socklen_t)RSTRING_LEN(addr)); /* overflow should be checked already */
}
else else
rsock_sys_fail_addrinfo(mesg, rai); rsock_sys_fail_addrinfo(mesg, rai);
} }