[前][次][番号順一覧][スレッド一覧]

ruby-changes:9628

From: matz <ko1@a...>
Date: Mon, 29 Dec 2008 18:01:53 +0900 (JST)
Subject: [ruby-changes:9628] Ruby:r21168 (trunk): * ext/io/wait/wait.c (io_ready_p): updated to follow RDoc.

matz	2008-12-29 18:01:38 +0900 (Mon, 29 Dec 2008)

  New Revision: 21168

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21168

  Log:
    * ext/io/wait/wait.c (io_ready_p): updated to follow RDoc.

  Modified files:
    trunk/ChangeLog
    trunk/ext/io/wait/wait.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21167)
+++ ChangeLog	(revision 21168)
@@ -1,3 +1,7 @@
+Mon Dec 29 17:52:16 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* ext/io/wait/wait.c (io_ready_p): updated to follow RDoc.
+
 Mon Dec 29 16:52:15 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* ext/socket/socket.c (s_recvfrom_nonblock): revert r21162.
Index: ext/io/wait/wait.c
===================================================================
--- ext/io/wait/wait.c	(revision 21167)
+++ ext/io/wait/wait.c	(revision 21168)
@@ -46,7 +46,8 @@
  * call-seq:
  *   io.ready? -> true, false or nil
  *
- * Returns non-nil if input available without blocking, or nil.
+ * Returns true if input available without blocking, or false.
+ * Returns nil if no information available.
  */
 
 static VALUE
@@ -58,10 +59,10 @@
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
     if (rb_io_read_pending(fptr)) return Qtrue;
-    if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qfalse;
-    if (ioctl(fptr->fd, FIONREAD, &n)) rb_sys_fail(0);
-    if (n > 0) return ioctl_arg2num(n);
-    return Qnil;
+    if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qnil;
+    if (ioctl(fptr->fd, FIONREAD, &n)) return Qnil;
+    if (n > 0) return Qtrue;
+    return Qfalse;
 }
 
 struct wait_readable_arg {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]