apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r584489 - in /apr/apr/trunk: file_io/netware/pipe.c file_io/os2/pipe.c file_io/unix/pipe.c include/apr_file_io.h
Date Sun, 14 Oct 2007 06:12:01 GMT
Author: wrowe
Date: Sat Oct 13 23:12:00 2007
New Revision: 584489

URL: http://svn.apache.org/viewvc?rev=584489&view=rev
Log:
Had inverted read/write.

This is why you don't do things like this, in/out is ambiguous.
(you write things in-to a pipe and read things out-of a pipe,
well except in APR ;-)

Modified:
    apr/apr/trunk/file_io/netware/pipe.c
    apr/apr/trunk/file_io/os2/pipe.c
    apr/apr/trunk/file_io/unix/pipe.c
    apr/apr/trunk/include/apr_file_io.h

Modified: apr/apr/trunk/file_io/netware/pipe.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/netware/pipe.c?rev=584489&r1=584488&r2=584489&view=diff
==============================================================================
--- apr/apr/trunk/file_io/netware/pipe.c (original)
+++ apr/apr/trunk/file_io/netware/pipe.c Sat Oct 13 23:12:00 2007
@@ -193,14 +193,14 @@
         case APR_FULL_BLOCK:
             break;
         case APR_READ_BLOCK:
-            apr_file_pipe_timeout_set(*in, 0);
+            apr_file_pipe_timeout_set(*out, 0);
             break;
         case APR_WRITE_BLOCK:
-            apr_file_pipe_timeout_set(*out, 0);
+            apr_file_pipe_timeout_set(*in, 0);
             break;
         default:
-            apr_file_pipe_timeout_set(*in, 0);
             apr_file_pipe_timeout_set(*out, 0);
+            apr_file_pipe_timeout_set(*in, 0);
     }
 }
 

Modified: apr/apr/trunk/file_io/os2/pipe.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/os2/pipe.c?rev=584489&r1=584488&r2=584489&view=diff
==============================================================================
--- apr/apr/trunk/file_io/os2/pipe.c (original)
+++ apr/apr/trunk/file_io/os2/pipe.c Sat Oct 13 23:12:00 2007
@@ -120,14 +120,14 @@
         case APR_FULL_BLOCK:
             break;
         case APR_READ_BLOCK:
-            apr_file_pipe_timeout_set(*in, 0);
+            apr_file_pipe_timeout_set(*out, 0);
             break;
         case APR_WRITE_BLOCK:
-            apr_file_pipe_timeout_set(*out, 0);
+            apr_file_pipe_timeout_set(*in, 0);
             break;
         default:
-            apr_file_pipe_timeout_set(*in, 0);
             apr_file_pipe_timeout_set(*out, 0);
+            apr_file_pipe_timeout_set(*in, 0);
     }
 }
 

Modified: apr/apr/trunk/file_io/unix/pipe.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/unix/pipe.c?rev=584489&r1=584488&r2=584489&view=diff
==============================================================================
--- apr/apr/trunk/file_io/unix/pipe.c (original)
+++ apr/apr/trunk/file_io/unix/pipe.c Sat Oct 13 23:12:00 2007
@@ -238,14 +238,14 @@
         case APR_FULL_BLOCK:
             break;
         case APR_READ_BLOCK:
-            apr_file_pipe_timeout_set(*in, 0);
+            apr_file_pipe_timeout_set(*out, 0);
             break;
         case APR_WRITE_BLOCK:
-            apr_file_pipe_timeout_set(*out, 0);
+            apr_file_pipe_timeout_set(*in, 0);
             break;
         default:
-            apr_file_pipe_timeout_set(*in, 0);
             apr_file_pipe_timeout_set(*out, 0);
+            apr_file_pipe_timeout_set(*in, 0);
     }
 }
 

Modified: apr/apr/trunk/include/apr_file_io.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_file_io.h?rev=584489&r1=584488&r2=584489&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_file_io.h (original)
+++ apr/apr/trunk/include/apr_file_io.h Sat Oct 13 23:12:00 2007
@@ -633,8 +633,8 @@
 
 /**
  * Create an anonymous pipe.
- * @param in The newly created pipe's file for writing.
- * @param out The newly created pipe's file for reading.
+ * @param in The newly created pipe's file for reading.
+ * @param out The newly created pipe's file for writing.
  * @param pool The pool to operate on.
  * @remark By default, the returned file descriptors will be inherited
  * by child processes created using apr_proc_create().  This can be
@@ -650,8 +650,8 @@
 
 /**
  * Create an anonymous pipe which portably supports async timeout options.
- * @param in The newly created pipe's file for writing.
- * @param out The newly created pipe's file for reading.
+ * @param in The newly created pipe's file for reading.
+ * @param out The newly created pipe's file for writing.
  * @param blocking one of these values defined in apr_thread_proc.h;
  * <pre>
  *       APR_FULL_BLOCK



Mime
View raw message