mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
c8a7361e45
commit
4b7c92fa90
3 changed files with 16 additions and 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>
|
Tue Jul 31 12:11:42 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* marshal.c (Init_marshal): new constant Marshal::MAJOR_VERSION
|
* marshal.c (Init_marshal): new constant Marshal::MAJOR_VERSION
|
||||||
|
|
|
@ -716,7 +716,7 @@ ruby_connect(fd, sockaddr, len, socks)
|
||||||
#if defined(HAVE_FCNTL)
|
#if defined(HAVE_FCNTL)
|
||||||
mode = fcntl(fd, F_GETFL, 0);
|
mode = fcntl(fd, F_GETFL, 0);
|
||||||
|
|
||||||
#ifdef O_NDELAY
|
#ifdef O_NDELAY
|
||||||
# define NONBLOCKING O_NDELAY
|
# define NONBLOCKING O_NDELAY
|
||||||
#else
|
#else
|
||||||
#ifdef O_NBIO
|
#ifdef O_NBIO
|
||||||
|
@ -781,7 +781,7 @@ ruby_connect(fd, sockaddr, len, socks)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static VALUE
|
static void
|
||||||
load_addr_info(h, serv, type, res)
|
load_addr_info(h, serv, type, res)
|
||||||
VALUE h, serv;
|
VALUE h, serv;
|
||||||
int type;
|
int type;
|
||||||
|
@ -820,8 +820,8 @@ load_addr_info(h, serv, type, res)
|
||||||
if (error) {
|
if (error) {
|
||||||
rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
|
rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static VALUE
|
static VALUE
|
||||||
open_inet(class, remote_host, remote_serv, local_host, local_serv, type)
|
open_inet(class, remote_host, remote_serv, local_host, local_serv, type)
|
||||||
VALUE class, remote_host, remote_serv, local_host, local_serv;
|
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)))
|
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;
|
fd = -1;
|
||||||
for (res = res_remote; res; res = res->ai_next) {
|
for (res = res_remote; res; res = res->ai_next) {
|
||||||
status = ruby_socket(res->ai_family,res->ai_socktype,res->ai_protocol);
|
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 remote_host, remote_serv;
|
||||||
VALUE local_host, local_serv;
|
VALUE local_host, local_serv;
|
||||||
|
|
||||||
int pcount = rb_scan_args(argc, argv, "22",
|
int pcount = rb_scan_args(argc, argv, "22",
|
||||||
&remote_host, &remote_serv,
|
&remote_host, &remote_serv,
|
||||||
&local_host, &local_serv);
|
&local_host, &local_serv);
|
||||||
|
|
||||||
Check_SafeStr(remote_host);
|
Check_SafeStr(remote_host);
|
||||||
|
|
||||||
if (!NIL_P(local_host)) {
|
if (!NIL_P(local_host)) {
|
||||||
Check_SafeStr(local_host);
|
Check_SafeStr(local_host);
|
||||||
}
|
}
|
||||||
|
@ -937,7 +937,7 @@ socks_s_open(class, host, serv)
|
||||||
SOCKSinit("ruby");
|
SOCKSinit("ruby");
|
||||||
init = 1;
|
init = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
Check_SafeStr(host);
|
Check_SafeStr(host);
|
||||||
return open_inet(class, host, serv, Qnil, Qnil, INET_SOCKS);
|
return open_inet(class, host, serv, Qnil, Qnil, INET_SOCKS);
|
||||||
}
|
}
|
||||||
|
|
|
@ -95,7 +95,7 @@ get_ppid()
|
||||||
static VALUE rb_cProcStatus;
|
static VALUE rb_cProcStatus;
|
||||||
VALUE rb_last_status = Qnil;
|
VALUE rb_last_status = Qnil;
|
||||||
|
|
||||||
static VALUE
|
static void
|
||||||
last_status_set(status)
|
last_status_set(status)
|
||||||
int status;
|
int status;
|
||||||
{
|
{
|
||||||
|
@ -653,7 +653,7 @@ proc_spawn_v(argv, prog)
|
||||||
}
|
}
|
||||||
before_exec();
|
before_exec();
|
||||||
status = spawnv(P_WAIT, prog, argv);
|
status = spawnv(P_WAIT, prog, argv);
|
||||||
after_exec();
|
after_exec();
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue