diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-07-31 08:04:13 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-07-31 08:04:13 +0000 |
| commit | 4b7c92fa90047ba6d3d2a479dda9fe0c83f0f424 (patch) | |
| tree | 99e89f9159cc74694089489b9100949f03f60903 /ext/socket/socket.c | |
| parent | c8a7361e45e3a149b970ae9cd74cbbcfbfd1d501 (diff) | |
* process.c (last_status_set): nothing returned, should be void.
* ext/socket/socket.c (load_addr_info): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/socket.c')
| -rw-r--r-- | ext/socket/socket.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index b909a433a7..86f9dfcc28 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -716,7 +716,7 @@ ruby_connect(fd, sockaddr, len, socks) #if defined(HAVE_FCNTL) mode = fcntl(fd, F_GETFL, 0); -#ifdef O_NDELAY +#ifdef O_NDELAY # define NONBLOCKING O_NDELAY #else #ifdef O_NBIO @@ -781,7 +781,7 @@ ruby_connect(fd, sockaddr, len, socks) } } -static VALUE +static void load_addr_info(h, serv, type, res) VALUE h, serv; int type; @@ -820,8 +820,8 @@ load_addr_info(h, serv, type, res) if (error) { rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error)); } - } + static VALUE open_inet(class, remote_host, remote_serv, local_host, local_serv, type) VALUE class, remote_host, remote_serv, local_host, local_serv; @@ -838,8 +838,8 @@ open_inet(class, remote_host, remote_serv, local_host, local_serv, type) */ if (type != INET_SERVER && (!NIL_P(local_host) || !NIL_P(local_serv))) - load_addr_info(local_host, local_serv, type, &res_local); - + load_addr_info(local_host, local_serv, type, &res_local); + fd = -1; for (res = res_remote; res; res = res->ai_next) { status = ruby_socket(res->ai_family,res->ai_socktype,res->ai_protocol); @@ -911,13 +911,13 @@ tcp_s_open(argc, argv, class) { VALUE remote_host, remote_serv; VALUE local_host, local_serv; - + int pcount = rb_scan_args(argc, argv, "22", &remote_host, &remote_serv, &local_host, &local_serv); Check_SafeStr(remote_host); - + if (!NIL_P(local_host)) { Check_SafeStr(local_host); } @@ -937,7 +937,7 @@ socks_s_open(class, host, serv) SOCKSinit("ruby"); init = 1; } - + Check_SafeStr(host); return open_inet(class, host, serv, Qnil, Qnil, INET_SOCKS); } |