Revert r1862435, r1862071 per veto from ivan

msgid: <CABw-3YcK0qbeYWDOwE684XtBj3rCT2CuVOBWWqda4gMtRyRJEw@mail.gmail.com>


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1866019 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 28 deletions

diff --git a/include/apr_file_info.h b/include/apr_file_info.h
index 0cf34ff06..cfddc68da 100644
--- a/include/apr_file_info.h
+++ b/include/apr_file_info.h
@@ -257,45 +257,17 @@ APR_DECLARE(apr_status_t) apr_dir_close(apr_dir_t *thedir);
  * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_
                  values 
  * @param thedir the directory descriptor returned from apr_dir_open
- *
  * @remark No ordering is guaranteed for the entries read.
- *         @c finfo->pool is set to the pool used to create @a thedir,
- *         and @c finfo->name is allocated from that pool.
  *
  * @note If @c APR_INCOMPLETE is returned all the fields in @a finfo may
  *       not be filled in, and you need to check the @c finfo->valid bitmask
  *       to verify that what you're looking for is there. When no more
  *       entries are available, APR_ENOENT is returned.
- *
- * @warning Allocations will use the directory pool; use
- *          apr_dir_pread() and a temporary pool to restrict memory
- *          consumption for a large directory.
  */                        
 APR_DECLARE(apr_status_t) apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted,
                                        apr_dir_t *thedir);
 
 /**
- * Read the next entry from the specified directory. 
- * @param finfo the file info structure and filled in by apr_dir_read
- * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_
-                 values 
- * @param thedir the directory descriptor returned from apr_dir_open
- * @param pool the pool to use for allocations
-
- * @remark No ordering is guaranteed for the entries read.  
- * @remark @c finfo->pool is set to @a pool, and @c finfo->name is
- *         allocated from that pool.
- *
- * @note If @c APR_INCOMPLETE is returned all the fields in @a finfo may
- *       not be filled in, and you need to check the @c finfo->valid bitmask
- *       to verify that what you're looking for is there. When no more
- *       entries are available, APR_ENOENT is returned.
- */                        
-APR_DECLARE(apr_status_t) apr_dir_pread(apr_finfo_t *finfo, apr_int32_t wanted,
-                                        apr_dir_t *thedir, apr_pool_t *pool);
-
-    
-/**
  * Rewind the directory to the first entry.
  * @param thedir the directory descriptor to rewind.
  */