apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1373078 - in /apr/apr/branches/1.5.x: ./ include/apr_file_io.h include/apr_network_io.h include/apr_thread_proc.h include/apr_want.h
Date Tue, 14 Aug 2012 20:48:12 GMT
Author: trawick
Date: Tue Aug 14 20:48:12 2012
New Revision: 1373078

URL: http://svn.apache.org/viewvc?rev=1373078&view=rev
Log:
Merge parts of r896382 applicable to apr 1.5.x from trunk:

Fixes various doxygen usage warnings and minor doxygen errors.
Submitted by: Neil Conway <nrc@cs.berkeley.edu>

(These changes were committed to the 1.3.x and 1.4.x branches
long ago with r896406 and r896402.)

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/include/apr_file_io.h
    apr/apr/branches/1.5.x/include/apr_network_io.h
    apr/apr/branches/1.5.x/include/apr_thread_proc.h
    apr/apr/branches/1.5.x/include/apr_want.h

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r896382

Modified: apr/apr/branches/1.5.x/include/apr_file_io.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_file_io.h?rev=1373078&r1=1373077&r2=1373078&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr_file_io.h (original)
+++ apr/apr/branches/1.5.x/include/apr_file_io.h Tue Aug 14 20:48:12 2012
@@ -678,6 +678,7 @@ APR_DECLARE(apr_status_t) apr_file_pipe_
  * @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;
+ * @param pool The pool to operate on.
  * <pre>
  *       APR_FULL_BLOCK
  *       APR_READ_BLOCK
@@ -696,7 +697,7 @@ APR_DECLARE(apr_status_t) apr_file_pipe_
 APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in, 
                                                   apr_file_t **out, 
                                                   apr_int32_t blocking, 
-                                                  apr_pool_t *p);
+                                                  apr_pool_t *pool);
 
 /**
  * Create a named pipe.

Modified: apr/apr/branches/1.5.x/include/apr_network_io.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_network_io.h?rev=1373078&r1=1373077&r2=1373078&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr_network_io.h (original)
+++ apr/apr/branches/1.5.x/include/apr_network_io.h Tue Aug 14 20:48:12 2012
@@ -355,7 +355,7 @@ APR_DECLARE(apr_status_t) apr_socket_con
  * return APR_EOF), if the socket's receive buffer is empty.  This
  * function does not block waiting for I/O.
  *
- * @param socket The socket to check
+ * @param sock The socket to check
  * @param atreadeof If APR_SUCCESS is returned, *atreadeof is set to
  *                  non-zero if a subsequent read would return APR_EOF
  * @return an error is returned if it was not possible to determine the
@@ -526,9 +526,10 @@ APR_DECLARE(apr_status_t) apr_socket_sen
 
 /**
  * Read data from a socket.  On success, the address of the peer from
- * which the data was sent is copied into the @param from parameter,
- * and the @param len parameter is updated to give the number of bytes
- * written to @param buf.
+ * which the data was sent is copied into the @a from parameter, and the
+ * @a len parameter is updated to give the number of bytes written to
+ * @a buf.
+ *
  * @param from Updated with the address from which the data was received
  * @param sock The socket to use
  * @param flags The flags to use

Modified: apr/apr/branches/1.5.x/include/apr_thread_proc.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_thread_proc.h?rev=1373078&r1=1373077&r2=1373078&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr_thread_proc.h (original)
+++ apr/apr/branches/1.5.x/include/apr_thread_proc.h Tue Aug 14 20:48:12 2012
@@ -730,13 +730,13 @@ APR_DECLARE(void) apr_proc_other_child_u
  * <pre>
  * rv = apr_proc_wait_all_procs(&proc, &exitcode, &status, APR_WAIT, p);
  * if (APR_STATUS_IS_CHILD_DONE(rv)) {
- * #if APR_HAS_OTHER_CHILD
+ * \#if APR_HAS_OTHER_CHILD
  *     if (apr_proc_other_child_alert(&proc, APR_OC_REASON_DEATH, status)
  *             == APR_SUCCESS) {
  *         ;  (already handled)
  *     }
  *     else
- * #endif
+ * \#endif
  *         [... handling non-otherchild processes death ...]
  * </pre>
  */

Modified: apr/apr/branches/1.5.x/include/apr_want.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_want.h?rev=1373078&r1=1373077&r2=1373078&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr_want.h (original)
+++ apr/apr/branches/1.5.x/include/apr_want.h Tue Aug 14 20:48:12 2012
@@ -30,9 +30,9 @@
  *
  * Typical usage:
  *
- *   #define APR_WANT_STRFUNC
- *   #define APR_WANT_MEMFUNC
- *   #include "apr_want.h"
+ *   \#define APR_WANT_STRFUNC
+ *   \#define APR_WANT_MEMFUNC
+ *   \#include "apr_want.h"
  *
  * The appropriate headers will be included.
  *



Mime
View raw message