summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-26 15:09:45 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-26 15:09:45 +0000
commit429cb7c025157e21aae2de4ab2072a6d1b10f88d (patch)
treeddd493b1959487e18260628d94187fb3eaa5aae2 /ext
parent61f3ff8d78192b0cc9115059e9340a8e57781705 (diff)
revert sock_sysaccept addition to [ruby-dev:28861].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10399 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/socket/socket.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 3c91ec472a..8aed248b29 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -2931,15 +2931,18 @@ sock_accept_nonblock(sock)
* * Socket#accept
*/
static VALUE
-sock_sysaccept(VALUE sock)
+sock_sysaccept(sock)
+ VALUE sock;
{
OpenFile *fptr;
+ VALUE sock2;
char buf[1024];
socklen_t len = sizeof buf;
GetOpenFile(sock, fptr);
- return rb_assoc_new(s_accept(0,fptr->fd,(struct sockaddr*)buf,&len),
- rb_str_new(buf, len));
+ sock2 = s_accept(0,fptr->fd,(struct sockaddr*)buf,&len);
+
+ return rb_assoc_new(sock2, rb_str_new(buf, len));
}
#ifdef HAVE_GETHOSTNAME