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

* ext/socket/socket.c (rsock_sys_fail_sockaddr): Delete 2nd argument.

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



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-04-06 04:35:29 +00:00
parent 8c6c73745e
commit b1fd376cbf
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sat Apr 6 13:34:20 2013 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (rsock_sys_fail_sockaddr): Delete 2nd argument.
* ext/socket/rubysocket.h (rsock_sys_fail_sockaddr): Follow above
change.
Sat Apr 6 13:13:39 2013 Tanaka Akira <akr@fsij.org> Sat Apr 6 13:13:39 2013 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (rsock_sys_fail_path): Use rb_str_inspect only * ext/socket/socket.c (rsock_sys_fail_path): Use rb_str_inspect only

2
ext/socket/rubysocket.h
View File

@ -335,6 +335,6 @@ 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, VALUE)); NORETURN(void rsock_sys_fail_sockaddr(const char *, VALUE));
#endif #endif

10
ext/socket/socket.c
View File

@ -47,9 +47,9 @@ rsock_sys_fail_path(const char *mesg, VALUE path)
} }
void void
rsock_sys_fail_sockaddr(const char *mesg, VALUE sock, VALUE addr) rsock_sys_fail_sockaddr(const char *mesg, VALUE addr)
{ {
VALUE host_port = sock_s_unpack_sockaddr_in(sock, addr); VALUE host_port = sock_s_unpack_sockaddr_in(rb_cSocket, addr);
rsock_sys_fail_host_port(mesg, rsock_sys_fail_host_port(mesg,
RARRAY_PTR(host_port)[1], RARRAY_PTR(host_port)[1],
@ -359,7 +359,7 @@ sock_connect(VALUE sock, VALUE addr)
fd = fptr->fd; fd = fptr->fd;
n = rsock_connect(fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LENINT(addr), 0); n = rsock_connect(fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LENINT(addr), 0);
if (n < 0) { if (n < 0) {
rsock_sys_fail_sockaddr("connect(2)", sock, addr); rsock_sys_fail_sockaddr("connect(2)", addr);
} }
return INT2FIX(n); return INT2FIX(n);
@ -421,7 +421,7 @@ sock_connect_nonblock(VALUE sock, VALUE addr)
if (n < 0) { if (n < 0) {
if (errno == EINPROGRESS) if (errno == EINPROGRESS)
rb_mod_sys_fail(rb_mWaitWritable, "connect(2) would block"); rb_mod_sys_fail(rb_mWaitWritable, "connect(2) would block");
rsock_sys_fail_sockaddr("connect(2)", sock, addr); rsock_sys_fail_sockaddr("connect(2)", addr);
} }
return INT2FIX(n); return INT2FIX(n);
@ -521,7 +521,7 @@ sock_bind(VALUE sock, VALUE addr)
SockAddrStringValue(addr); SockAddrStringValue(addr);
GetOpenFile(sock, fptr); GetOpenFile(sock, fptr);
if (bind(fptr->fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LENINT(addr)) < 0) if (bind(fptr->fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LENINT(addr)) < 0)
rsock_sys_fail_sockaddr("bind(2)", sock, addr); rsock_sys_fail_sockaddr("bind(2)", addr);
return INT2FIX(0); return INT2FIX(0);
} }