diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/socket.c | 16 | ||||
| -rw-r--r-- | process.c | 4 |
3 files changed, 16 insertions, 10 deletions
@@ -1,3 +1,9 @@ +Tue Jul 31 15:16:39 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> + + * process.c (last_status_set): nothing returned, should be void. + + * ext/socket/socket.c (load_addr_info): ditto. + Tue Jul 31 12:11:42 2001 Yukihiro Matsumoto <matz@ruby-lang.org> * marshal.c (Init_marshal): new constant Marshal::MAJOR_VERSION 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); } @@ -95,7 +95,7 @@ get_ppid() static VALUE rb_cProcStatus; VALUE rb_last_status = Qnil; -static VALUE +static void last_status_set(status) int status; { @@ -653,7 +653,7 @@ proc_spawn_v(argv, prog) } before_exec(); status = spawnv(P_WAIT, prog, argv); - after_exec(); + after_exec(); return status; } |