summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-15 14:51:09 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-15 14:51:09 +0000
commit2b7996e83978097552b4a280ec9f9983401810e5 (patch)
tree2f0d87e55c1e77841cdd2f2869c56ad667096aa4 /thread.c
parent29c2876d610275a42642ecb67ddc28906e484968 (diff)
* include/ruby/intern.h: remove rb_fd_copy() to rb_fd_dup() and
rb_w32_fdcopy() to rb_w32_fd_dup(). * win32/win32.c: ditto. * thread.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/thread.c b/thread.c
index 182feb31a1..88c396e185 100644
--- a/thread.c
+++ b/thread.c
@@ -2392,7 +2392,7 @@ rb_fd_isset(int n, const rb_fdset_t *fds)
}
void
-rb_fd_copy(rb_fdset_t *dst, const rb_fdset_t *src)
+rb_fd_dup(rb_fdset_t *dst, const rb_fdset_t *src)
{
size_t size = howmany(rb_fd_max(src), NFDBITS) * sizeof(fd_mask);
@@ -2446,7 +2446,7 @@ void
rb_fd_init_copy(rb_fdset_t *dst, rb_fdset_t *src)
{
rb_fd_init(dst);
- rb_fd_copy(dst, src);
+ rb_fd_dup(dst, src);
}
void
@@ -2567,11 +2567,11 @@ do_select(int n, rb_fdset_t *read, rb_fdset_t *write, rb_fdset_t *except,
if (result != 0) break;
if (read)
- rb_fd_copy(read, &orig_read);
+ rb_fd_dup(read, &orig_read);
if (write)
- rb_fd_copy(write, &orig_write);
+ rb_fd_dup(write, &orig_write);
if (except)
- rb_fd_copy(except, &orig_except);
+ rb_fd_dup(except, &orig_except);
if (timeout) {
struct timeval elapsed;
gettimeofday(&elapsed, NULL);
@@ -2603,11 +2603,11 @@ do_select(int n, rb_fdset_t *read, rb_fdset_t *write, rb_fdset_t *except,
case ERESTART:
#endif
if (read)
- rb_fd_copy(read, &orig_read);
+ rb_fd_dup(read, &orig_read);
if (write)
- rb_fd_copy(write, &orig_write);
+ rb_fd_dup(write, &orig_write);
if (except)
- rb_fd_copy(except, &orig_except);
+ rb_fd_dup(except, &orig_except);
if (timeout) {
double d = limit - timeofday();