updated patch for 12x's head.

On Oct 28, 2007 3:48 PM, Lucian Adrian Grijincu
<[EMAIL PROTECTED]> wrote:
> I've
> * moved the warnings to an area where they will be seen by doxygen
> * replaced the deprecated form of the flags with the new APR_FOPEN_* form.
> * added APR_FOPEN_LARGEFILE and APR_FOPEN_SPARSE (only in trunk) to
> the list of args supported by apr_file_open
>
>



-- 
Lucian
Index: include/apr_file_io.h
===================================================================
--- include/apr_file_io.h	(revision 592338)
+++ include/apr_file_io.h	(working copy)
@@ -75,8 +75,17 @@
                                              file should support
                                              apr_socket_sendfile operation */
 #define APR_FOPEN_LARGEFILE   0x04000 /**< Platform dependent flag to enable
-                                         large file support; WARNING see
-                                         below. */
+                                         large file support.
[EMAIL PROTECTED] The APR_LARGEFILE flag only has effect on some platforms
+ * where sizeof(apr_off_t) == 4.  Where implemented, it allows opening
+ * and writing to a file which exceeds the size which can be
+ * represented by apr_off_t (2 gigabytes).  When a file's size does
+ * exceed 2Gb, apr_file_info_get() will fail with an error on the
+ * descriptor, likewise apr_stat()/apr_lstat() will fail on the
+ * filename.  apr_dir_read() will fail with APR_INCOMPLETE on a
+ * directory entry for a large file depending on the particular
+ * APR_FINFO_* flags.  Generally, it is not recommended to use this
+ * flag. */
 /* backcompat */
 #define APR_READ             APR_FOPEN_READ       /**< @deprecated @see APR_FOPEN_READ */
 #define APR_WRITE            APR_FOPEN_WRITE      /**< @deprecated @see APR_FOPEN_WRITE */   
@@ -93,17 +102,8 @@
 #define APR_SENDFILE_ENABLED APR_FOPEN_SENDFILE_ENABLED /**< @deprecated @see APR_FOPEN_SENDFILE_ENABLED */   
 #define APR_LARGEFILE        APR_FOPEN_LARGEFILE  /**< @deprecated @see APR_FOPEN_LARGEFILE */   
 
-/** @warning The APR_LARGEFILE flag only has effect on some platforms
- * where sizeof(apr_off_t) == 4.  Where implemented, it allows opening
- * and writing to a file which exceeds the size which can be
- * represented by apr_off_t (2 gigabytes).  When a file's size does
- * exceed 2Gb, apr_file_info_get() will fail with an error on the
- * descriptor, likewise apr_stat()/apr_lstat() will fail on the
- * filename.  apr_dir_read() will fail with APR_INCOMPLETE on a
- * directory entry for a large file depending on the particular
- * APR_FINFO_* flags.  Generally, it is not recommended to use this
- * flag. */
 
+
 /** @} */
 
 /**
@@ -186,28 +186,29 @@
  * @param fname The full path to the file (using / on all systems)
  * @param flag Or'ed value of:
  * <PRE>
- *         APR_READ              open for reading
- *         APR_WRITE             open for writing
- *         APR_CREATE            create the file if not there
- *         APR_APPEND            file ptr is set to end prior to all writes
- *         APR_TRUNCATE          set length to zero if file exists
- *         APR_BINARY            not a text file (This flag is ignored on 
- *                               UNIX because it has no meaning)
- *         APR_BUFFERED          buffer the data.  Default is non-buffered
- *         APR_EXCL              return error if APR_CREATE and file exists
- *         APR_DELONCLOSE        delete the file after closing.
- *         APR_XTHREAD           Platform dependent tag to open the file
- *                               for use across multiple threads
- *         APR_SHARELOCK         Platform dependent support for higher
- *                               level locked read/write access to support
- *                               writes across process/machines
- *         APR_FILE_NOCLEANUP    Do not register a cleanup with the pool 
- *                               passed in on the <EM>pool</EM> argument (see below).
- *                               The apr_os_file_t handle in apr_file_t will not
- *                               be closed when the pool is destroyed.
- *         APR_SENDFILE_ENABLED  Open with appropriate platform semantics
- *                               for sendfile operations.  Advisory only,
- *                               apr_socket_sendfile does not check this flag.
+ *      APR_FOPEN_READ              open for reading
+ *      APR_FOPEN_WRITE             open for writing
+ *      APR_FOPEN_CREATE            create the file if not there
+ *      APR_FOPEN_APPEND            file ptr is set to end prior to all writes
+ *      APR_FOPEN_TRUNCATE          set length to zero if file exists
+ *      APR_FOPEN_BINARY            not a text file (This flag is ignored on 
+ *                                  UNIX because it has no meaning)
+ *      APR_FOPEN_BUFFERED          buffer the data.  Default is non-buffered
+ *      APR_FOPEN_EXCL              return error if APR_CREATE and file exists
+ *      APR_FOPEN_DELONCLOSE        delete the file after closing.
+ *      APR_FOPEN_XTHREAD           Platform dependent tag to open the file
+ *                                  for use across multiple threads
+ *      APR_FOPEN_SHARELOCK         Platform dependent support for higher
+ *                                  level locked read/write access to support
+ *                                  writes across process/machines
+ *      APR_FOPEN_NOCLEANUP         Do not register a cleanup with the pool 
+ *                                  passed in on the <EM>pool</EM> argument
+ *                                  (see below).
+ *                                  The apr_os_file_t handle in apr_file_t will
+ *                                  not be closed when the pool is destroyed.
+ *      APR_FOPEN_SENDFILE_ENABLED  Open with appropriate platform semantics
+ *                                  for sendfile operations.  Advisory only,
+ *                                  apr_socket_sendfile does not check this flag
  * </PRE>
  * @param perm Access permissions for file.
  * @param pool The pool to use.

Reply via email to