jwoolley 01/10/01 17:55:46
Modified: file_io/unix dir.c open.c
Log:
Simple is nice. :)
Submitted by: Greg Stein
Revision Changes Path
1.58 +1 -2 apr/file_io/unix/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/dir.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -u -r1.57 -r1.58
--- dir.c 2001/09/04 22:54:58 1.57
+++ dir.c 2001/10/02 00:55:45 1.58
@@ -103,8 +103,7 @@
apr_status_t apr_dir_close(apr_dir_t *thedir)
{
- apr_pool_cleanup_kill(thedir->cntxt, thedir, dir_cleanup);
- return dir_cleanup(thedir);
+ return apr_pool_cleanup_run(thedir->cntxt, thedir, dir_cleanup);
}
apr_status_t apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted,
1.87 +1 -2 apr/file_io/unix/open.c
Index: open.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/open.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -u -r1.86 -r1.87
--- open.c 2001/10/01 19:12:49 1.86
+++ open.c 2001/10/02 00:55:45 1.87
@@ -174,8 +174,7 @@
APR_DECLARE(apr_status_t) apr_file_close(apr_file_t *file)
{
- apr_pool_cleanup_kill(file->cntxt, file, apr_unix_file_cleanup);
- return apr_unix_file_cleanup(file);
+ return apr_pool_cleanup_run(file->cntxt, file, apr_unix_file_cleanup);
}
APR_DECLARE(apr_status_t) apr_file_remove(const char *path, apr_pool_t *cont)
