kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (nogvl_io_cntl): rb_cloexec_fcntl_dupfd's 2nd argument is int.

Browse source 
* process.c (move_fds_to_avoid_crash): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2011-11-01 05:56:51 +00:00
parent cd3445ca6e
commit f926980902
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Nov 1 14:55:29 2011 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (nogvl_io_cntl): rb_cloexec_fcntl_dupfd's 2nd argument is int.
* process.c (move_fds_to_avoid_crash): ditto.
Tue Nov 1 13:14:33 2011 NARUSE, Yui <naruse@ruby-lang.org> Tue Nov 1 13:14:33 2011 NARUSE, Yui <naruse@ruby-lang.org>
* vsnprintf.c (BSD_vfprintf): support 'll' prefix. * vsnprintf.c (BSD_vfprintf): support 'll' prefix.

2
io.c
View file

@ -7842,7 +7842,7 @@ static VALUE nogvl_io_cntl(void *ptr)
else else
#if defined(F_DUPFD) #if defined(F_DUPFD)
if (arg->cmd == F_DUPFD) if (arg->cmd == F_DUPFD)
return (VALUE)rb_cloexec_fcntl_dupfd(arg->fd, arg->narg); return (VALUE)rb_cloexec_fcntl_dupfd(arg->fd, (int)arg->narg);
else else
#endif #endif
return (VALUE)fcntl(arg->fd, arg->cmd, arg->narg); return (VALUE)fcntl(arg->fd, arg->cmd, arg->narg);

2
process.c
View file

@ -2499,7 +2499,7 @@ proc_syswait(VALUE pid)
static int static int
move_fds_to_avoid_crash(int *fdp, int n, VALUE fds) move_fds_to_avoid_crash(int *fdp, int n, VALUE fds)
{ {
long min = 0; int min = 0;
int i; int i;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
int ret; int ret;