diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-31 12:49:16 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-31 12:49:16 +0000 |
commit | 1a70dfe6f4750a577b889a568527a07ed540d43c (patch) | |
tree | 11a9bd06f5fff7d9e3df7397f50f4ee1754ea9c6 /ext/socket | |
parent | 6533f070ba616662b7ab7504f7bc2a0827394a89 (diff) | |
download | ruby-1a70dfe6f4750a577b889a568527a07ed540d43c.tar.gz |
* include/ruby/intern.h (rb_fd_fix_cloexec): renamed from
rb_fd_set_cloexec.
* io.c: follow the above renaming.
* ext/pty/pty.c: ditto.
* ext/socket/init.c: ditto.
* ext/socket/socket.c: ditto.
* ext/socket/ancdata.c: ditto.
* ext/socket/unixsocket.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33585 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
-rw-r--r-- | ext/socket/ancdata.c | 4 | ||||
-rw-r--r-- | ext/socket/init.c | 6 | ||||
-rw-r--r-- | ext/socket/socket.c | 4 | ||||
-rw-r--r-- | ext/socket/unixsocket.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 848b332181..6d824ffc99 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1396,7 +1396,7 @@ discard_cmsg(struct cmsghdr *cmh, char *msg_end, int msg_peek_p) int *end = (int *)((char *)cmh + cmh->cmsg_len); while ((char *)fdp + sizeof(int) <= (char *)end && (char *)fdp + sizeof(int) <= msg_end) { - rb_fd_set_cloexec(*fdp); + rb_fd_fix_cloexec(*fdp); close(*fdp); fdp++; } @@ -1439,7 +1439,7 @@ make_io_for_unix_rights(VALUE ctl, struct cmsghdr *cmh, char *msg_end) VALUE io; if (fstat(fd, &stbuf) == -1) rb_raise(rb_eSocket, "invalid fd in SCM_RIGHTS"); - rb_fd_set_cloexec(fd); + rb_fd_fix_cloexec(fd); if (S_ISSOCK(stbuf.st_mode)) io = rsock_init_sock(rb_obj_alloc(rb_cSocket), fd); else diff --git a/ext/socket/init.c b/ext/socket/init.c index ca271f3b5a..70c92d7452 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -252,7 +252,7 @@ rsock_socket(int domain, int type, int proto) } } if (0 <= fd) - rb_fd_set_cloexec(fd); + rb_fd_fix_cloexec(fd); return fd; } @@ -466,7 +466,7 @@ rsock_s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, s } rb_sys_fail("accept(2)"); } - rb_fd_set_cloexec(fd2); + rb_fd_fix_cloexec(fd2); make_fd_nonblock(fd2); return rsock_init_sock(rb_obj_alloc(klass), fd2); } @@ -513,7 +513,7 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len) } rb_sys_fail(0); } - rb_fd_set_cloexec(fd2); + rb_fd_fix_cloexec(fd2); if (!klass) return INT2NUM(fd2); return rsock_init_sock(rb_obj_alloc(klass), fd2); } diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 92407185fc..767446d8da 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -119,8 +119,8 @@ rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass) if (ret < 0) { rb_sys_fail("socketpair(2)"); } - rb_fd_set_cloexec(sp[0]); - rb_fd_set_cloexec(sp[1]); + rb_fd_fix_cloexec(sp[0]); + rb_fd_fix_cloexec(sp[1]); s1 = rsock_init_sock(rb_obj_alloc(klass), sp[0]); s2 = rsock_init_sock(rb_obj_alloc(klass), sp[1]); diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index 7f2d628167..cd4dd7b05f 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -383,7 +383,7 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock) #if FD_PASSING_BY_MSG_CONTROL memcpy(&fd, CMSG_DATA(&cmsg.hdr), sizeof(int)); #endif - rb_fd_set_cloexec(fd); + rb_fd_fix_cloexec(fd); if (klass == Qnil) return INT2FIX(fd); |