apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: apr/include apr_file_io.h apr_file_info.h
Date Mon, 17 May 2004 20:14:49 GMT
jorton      2004/05/17 13:14:49

  Modified:    include  apr_file_io.h apr_file_info.h
  Log:
  * include/apr_file_io.h, include/apr_file_info.h: cont->pool
  conversions.
  
  Revision  Changes    Path
  1.152     +23 -23    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.151
  retrieving revision 1.152
  diff -d -u -r1.151 -r1.152
  --- apr_file_io.h	17 May 2004 20:08:15 -0000	1.151
  +++ apr_file_io.h	17 May 2004 20:14:49 -0000	1.152
  @@ -165,7 +165,7 @@
    *                               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).
  + *                               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
  @@ -173,13 +173,13 @@
    *                               apr_socket_sendfile does not check this flag.
    * </PRE>
    * @param perm Access permissions for file.
  - * @param cont The pool to use.
  + * @param pool The pool to use.
    * @remark If perm is APR_OS_DEFAULT and the file is being created, appropriate 
    *      default permissions will be used.
    */
  -APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new_file, const char *fname,
  -                                   apr_int32_t flag, apr_fileperms_t perm,
  -                                   apr_pool_t *cont);
  +APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **newf, const char *fname,
  +                                        apr_int32_t flag, apr_fileperms_t perm,
  +                                        apr_pool_t *pool);
   
   /**
    * Close the specified file.
  @@ -190,10 +190,10 @@
   /**
    * delete the specified file.
    * @param path The full path to the file (using / on all systems)
  - * @param cont The pool to use.
  + * @param pool The pool to use.
    * @remark If the file is open, it won't be removed until all instances are closed.
    */
  -APR_DECLARE(apr_status_t) apr_file_remove(const char *path, apr_pool_t *cont);
  +APR_DECLARE(apr_status_t) apr_file_remove(const char *path, apr_pool_t *pool);
   
   /**
    * rename the specified file.
  @@ -250,7 +250,7 @@
   /**
    * open standard error as an apr file pointer.
    * @param thefile The apr file to use as stderr.
  - * @param cont The pool to allocate the file out of.
  + * @param pool The pool to allocate the file out of.
    * 
    * @remark The only reason that the apr_file_open_std* functions exist
    * is that you may not always have a stderr/out/in on Windows.  This
  @@ -263,12 +263,12 @@
    * platforms.
    */
   APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile,
  -                                          apr_pool_t *cont);
  +                                               apr_pool_t *pool);
   
   /**
    * open standard output as an apr file pointer.
    * @param thefile The apr file to use as stdout.
  - * @param cont The pool to allocate the file out of.
  + * @param pool The pool to allocate the file out of.
    * 
    * @remark The only reason that the apr_file_open_std* functions exist
    * is that you may not always have a stderr/out/in on Windows.  This
  @@ -281,12 +281,12 @@
    * platforms.
    */
   APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile,
  -                                          apr_pool_t *cont);
  +                                               apr_pool_t *pool);
   
   /**
    * open standard input as an apr file pointer.
    * @param thefile The apr file to use as stdin.
  - * @param cont The pool to allocate the file out of.
  + * @param pool The pool to allocate the file out of.
    * 
    * @remark The only reason that the apr_file_open_std* functions exist
    * is that you may not always have a stderr/out/in on Windows.  This
  @@ -299,7 +299,7 @@
    * platforms.
    */
   APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile,
  -                                              apr_pool_t *cont);
  +                                              apr_pool_t *pool);
   
   /**
    * Read data from the specified file.
  @@ -505,20 +505,20 @@
    * Create an anonymous pipe.
    * @param in The file descriptor to use as input to the pipe.
    * @param out The file descriptor to use as output from the pipe.
  - * @param cont The pool to operate on.
  + * @param pool The pool to operate on.
    */
   APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out,
  -                                          apr_pool_t *cont);
  +                                               apr_pool_t *pool);
   
   /**
    * Create a named pipe.
    * @param filename The filename of the named pipe
    * @param perm The permissions for the newly created pipe.
  - * @param cont The pool to operate on.
  + * @param pool The pool to operate on.
    */
   APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename, 
                                                  apr_fileperms_t perm, 
  -                                               apr_pool_t *cont);
  +                                               apr_pool_t *pool);
   
   /**
    * Get the timeout value for a pipe or manipulate the blocking state.
  @@ -620,7 +620,7 @@
    *            APR_FILE_ATTR_HIDDEN     - make the file hidden
    * </PRE>
    * @param attr_mask Mask of valid bits in attributes.
  - * @param cont the pool to use.
  + * @param pool the pool to use.
    * @remark This function should be used in preference to explict manipulation
    *      of the file permissions, because the operations to provide these
    *      attributes are platform specific and may involve more than simply
  @@ -631,7 +631,7 @@
   APR_DECLARE(apr_status_t) apr_file_attrs_set(const char *fname,
                                                apr_fileattrs_t attributes,
                                                apr_fileattrs_t attr_mask,
  -                                             apr_pool_t *cont);
  +                                             apr_pool_t *pool);
   
   /**
    * Set the mtime of the specified file.
  @@ -649,10 +649,10 @@
    * Create a new directory on the file system.
    * @param path the path for the directory to be created.  (use / on all systems)
    * @param perm Permissions for the new direcoty.
  - * @param cont the pool to use.
  + * @param pool the pool to use.
    */                        
   APR_DECLARE(apr_status_t) apr_dir_make(const char *path, apr_fileperms_t perm, 
  -                        apr_pool_t *cont);
  +                                       apr_pool_t *pool);
   
   /** Creates a new directory on the file system, but behaves like
    * 'mkdir -p'. Creates intermediate directories as required. No error
  @@ -668,9 +668,9 @@
   /**
    * Remove directory from the file system.
    * @param path the path for the directory to be removed.  (use / on all systems)
  - * @param cont the pool to use.
  + * @param pool the pool to use.
    */                        
  -APR_DECLARE(apr_status_t) apr_dir_remove(const char *path, apr_pool_t *cont);
  +APR_DECLARE(apr_status_t) apr_dir_remove(const char *path, apr_pool_t *pool);
   
   /**
    * get the specified file's stats.
  
  
  
  1.46      +4 -4      apr/include/apr_file_info.h
  
  Index: apr_file_info.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_file_info.h,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -d -u -r1.45 -r1.46
  --- apr_file_info.h	21 Apr 2004 21:11:21 -0000	1.45
  +++ apr_file_info.h	17 May 2004 20:14:49 -0000	1.46
  @@ -208,10 +208,10 @@
    * never touched if the call fails.
    * @param fname The name of the file to stat.
    * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values 
  - * @param cont the pool to use to allocate the new file. 
  + * @param pool the pool to use to allocate the new file. 
    */ 
   APR_DECLARE(apr_status_t) apr_stat(apr_finfo_t *finfo, const char *fname,
  -                                   apr_int32_t wanted, apr_pool_t *cont);
  +                                   apr_int32_t wanted, apr_pool_t *pool);
   
   /** @} */
   /**
  @@ -223,11 +223,11 @@
    * Open the specified directory.
    * @param new_dir The opened directory descriptor.
    * @param dirname The full path to the directory (use / on all systems)
  - * @param cont The pool to use.
  + * @param pool The pool to use.
    */                        
   APR_DECLARE(apr_status_t) apr_dir_open(apr_dir_t **new_dir, 
                                          const char *dirname, 
  -                                       apr_pool_t *cont);
  +                                       apr_pool_t *pool);
   
   /**
    * close the specified directory. 
  
  
  

Mime
View raw message