diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-26 15:09:45 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-26 15:09:45 +0000 |
| commit | a2c6195e5d31d5fe416b1fe790aa13179749495d (patch) | |
| tree | ddd493b1959487e18260628d94187fb3eaa5aae2 /ext/socket | |
| parent | e4def999c5645a8f0906c7339740102e290a40af (diff) | |
| download | ruby-a2c6195e5d31d5fe416b1fe790aa13179749495d.tar.gz ruby-a2c6195e5d31d5fe416b1fe790aa13179749495d.tar.xz ruby-a2c6195e5d31d5fe416b1fe790aa13179749495d.zip | |
revert sock_sysaccept addition to [ruby-dev:28861].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10399 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/socket.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 3c91ec472..8aed248b2 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 |