apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/file_io/win32 open.c
Date Mon, 14 Oct 2002 20:05:58 GMT
wrowe       2002/10/14 13:05:58

  Modified:    include  apr_file_io.h
               file_io/win32 open.c
  Log:
    I really disliked this identifier, found a better one.
  
  Revision  Changes    Path
  1.132     +22 -22    apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_file_io.h,v
  retrieving revision 1.131
  retrieving revision 1.132
  diff -u -r1.131 -r1.132
  --- apr_file_io.h	14 Oct 2002 17:40:10 -0000	1.131
  +++ apr_file_io.h	14 Oct 2002 20:05:58 -0000	1.132
  @@ -103,7 +103,7 @@
                                           writes across process/machines */
   #define APR_FILE_NOCLEANUP  2048   /**< Do not register a cleanup when the file
                                           is opened */
  -#define APR_OPEN_FOR_SENDFILE 4096 /**< Open with appropriate semantics for
  +#define APR_SENDFILE_ENABLED  4096 /**< Open with appropriate semantics for
                                           apr_sendfile operation */ 
   /** @} */
   
  @@ -167,27 +167,27 @@
    * @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>cont</EM> argument (see
below).
  - *                                The apr_os_file_t handle in apr_file_t will not
  - *                                be closed when the pool is destroyed.
  - *           APR_OPEN_FOR_SENDFILE  Open with appropriate platform semantics
  - *                                for sendfile operations.
  + *         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>cont</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.
    * </PRE>
    * @param perm Access permissions for file.
    * @param cont The pool to use.
  
  
  
  1.110     +3 -3      apr/file_io/win32/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/open.c,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -u -r1.109 -r1.110
  --- open.c	14 Oct 2002 17:40:10 -0000	1.109
  +++ open.c	14 Oct 2002 20:05:58 -0000	1.110
  @@ -344,7 +344,7 @@
       {
           apr_wchar_t wfname[APR_PATH_MAX];
   
  -        if (flag & APR_OPEN_FOR_SENDFILE) {    
  +        if (flag & APR_SENDFILE_ENABLED) {    
               /* This feature is required to enable sendfile operations
                * against the file on Win32. Also implies APR_XTHREAD.
                */
  @@ -363,10 +363,10 @@
       ELSE_WIN_OS_IS_ANSI {
           handle = CreateFileA(fname, oflags, sharemode,
                                NULL, createflags, attributes, 0);
  -        if (flag & APR_OPEN_FOR_SENDFILE) {    
  +        if (flag & APR_SENDFILE_ENABLED) {    
               /* This feature is not supported on this platform.
                */
  -            flag &= ~APR_OPEN_FOR_SENDFILE;
  +            flag &= ~APR_SENDFILE_ENABLED;
           }
   
       }
  
  
  

Mime
View raw message