diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-29 08:14:35 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-29 08:14:35 +0000 |
| commit | 527cc9279367014d85f6fb96aebd301bdb3baf11 (patch) | |
| tree | 8e1756f5d44db15d9552cffc93fe08957010cf54 | |
| parent | 445b6d5d0169b45fe9c8a00edbc862a79f9ef492 (diff) | |
| download | ruby-527cc9279367014d85f6fb96aebd301bdb3baf11.tar.gz | |
* ext/socket/socket.c (s_recvfrom_nonblock): revert r21162.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ext/socket/socket.c | 9 |
2 files changed, 7 insertions, 15 deletions
@@ -1,3 +1,7 @@ +Mon Dec 29 16:52:15 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/socket/socket.c (s_recvfrom_nonblock): revert r21162. + Mon Dec 29 16:16:20 2008 Koichi Sasada <ko1@atdot.net> * vm.c (vm_set_eval_stack, vm_set_main_stack, vm_set_top_stack): @@ -31,15 +35,6 @@ Mon Dec 29 10:58:54 2008 NARUSE, Yui <naruse@ruby-lang.org> * io.c (rb_scan_open_args): ditto. -Mon Dec 29 10:12:12 2008 Yukihiro Matsumoto <matz@ruby-lang.org> - - * ext/socket/socket.c (s_recvfrom_nonblock): default maxlen to be - 65536. suggested by akr in [ruby-core:20918]. response to - feature request #936 in [ruby-core:20917]. - - * ext/socket/socket.c (s_recvfrom_nonblock): fixed awesome typo. - sorry. - Mon Dec 29 07:15:16 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * cont.c: small RDoc fix mentioned from <radek.bulat at gmail.com> diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 0a609fbb02..0646f7bef4 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -690,12 +690,11 @@ s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from) int fd, flags; VALUE addr = Qnil; - rb_scan_args(argc, argv, "02", &len, &flg); + rb_scan_args(argc, argv, "11", &len, &flg); - if (len == Qnil) buflen = 65536; - else buflen = NUM2INT(len); if (flg == Qnil) flags = 0; else flags = NUM2INT(flg); + buflen = NUM2INT(len); #ifdef MSG_DONTWAIT /* MSG_DONTWAIT avoids the race condition between fcntl and recvfrom. @@ -749,13 +748,11 @@ bsock_recv(int argc, VALUE *argv, VALUE sock) /* * call-seq: - * basicsocket.recv_nonblock() => mesg * basicsocket.recv_nonblock(maxlen) => mesg * basicsocket.recv_nonblock(maxlen, flags) => mesg * * Receives up to _maxlen_ bytes from +socket+ using recvfrom(2) after * O_NONBLOCK is set for the underlying file descriptor. - * If _maxlen_ is ommitted, its default value is 65536. * _flags_ is zero or more of the +MSG_+ options. * The result, _mesg_, is the data received. * @@ -1881,7 +1878,6 @@ udp_send(int argc, VALUE *argv, VALUE sock) /* * call-seq: - * udpsocket.recvfrom_nonblock() => [mesg, sender_inet_addr] * udpsocket.recvfrom_nonblock(maxlen) => [mesg, sender_inet_addr] * udpsocket.recvfrom_nonblock(maxlen, flags) => [mesg, sender_inet_addr] * @@ -1924,6 +1920,7 @@ udp_send(int argc, VALUE *argv, VALUE sock) static VALUE udp_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock) { + return s_recvfrom_nonblock(sock, argc, argv, RECV_IP); } |