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

ruby-changes:9951

From: usa <ko1@a...>
Date: Tue, 13 Jan 2009 18:24:14 +0900 (JST)
Subject: [ruby-changes:9951] Ruby:r21492 (trunk): * io.c (rb_io_close_read): call rb_io_fptr_cleanup() instead of

usa	2009-01-13 18:23:54 +0900 (Tue, 13 Jan 2009)

  New Revision: 21492

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

  Log:
    * io.c (rb_io_close_read): call rb_io_fptr_cleanup() instead of
      fptr_finalize() because the fptr has special finalizser if it is a
      pipe.  [ruby-dev:37757] (3)

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21491)
+++ ChangeLog	(revision 21492)
@@ -1,3 +1,9 @@
+Tue Jan 13 18:21:44 2009  NAKAMURA Usaku  <usa@r...>
+
+	* io.c (rb_io_close_read): call rb_io_fptr_cleanup() instead of
+	  fptr_finalize() because the fptr has special finalizser if it is a
+	  pipe.  [ruby-dev:37757] (3)
+
 Tue Jan 13 18:19:49 2009  NAKAMURA Usaku  <usa@r...>
 
 	* io.c (rb_io_initialize): workaround for Windows. [ruby-dev:37686]
@@ -49,7 +55,7 @@
 
 	* ext/socket/extconf.rb: use headers instead of "netdb.h" in checking
 	  getnameinfo() and getaddrinfo() because Windows doesn't have it.
-	  see [ruby-dev:37757].
+	  [ruby-dev:37757] (1)
 
 	* ext/socket/sockport.h (SA_LEN): use sockaddr_in6 when defined AF_INET6
 	  if INET6 is not defined.  winsock2's getaddrinfo() returns
Index: io.c
===================================================================
--- io.c	(revision 21491)
+++ io.c	(revision 21492)
@@ -3378,7 +3378,7 @@
     write_io = GetWriteIO(io);
     if (io != write_io) {
 	rb_io_t *wfptr;
-        fptr_finalize(fptr, Qfalse);
+        rb_io_fptr_cleanup(fptr, Qfalse);
 	GetOpenFile(write_io, wfptr);
         RFILE(io)->fptr = wfptr;
         RFILE(write_io)->fptr = NULL;

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

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