diff options
| author | Doug MacEachern <dougm@apache.org> | 2001-02-08 07:45:23 +0000 |
|---|---|---|
| committer | Doug MacEachern <dougm@apache.org> | 2001-02-08 07:45:23 +0000 |
| commit | bc1b73cb6002c158ead8d736f25eb70d5124ecda (patch) | |
| tree | 136752321dd3e22c22463c9ab35a700ab0507729 /file_io/unix/dir.c | |
| parent | 2d3db4e26d42b1fd65bb65bc17f247b0c78a25f6 (diff) | |
| download | apr-bc1b73cb6002c158ead8d736f25eb70d5124ecda.tar.gz | |
renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@61194 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io/unix/dir.c')
| -rw-r--r-- | file_io/unix/dir.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/file_io/unix/dir.c b/file_io/unix/dir.c index 2e0f15015..93bcc6165 100644 --- a/file_io/unix/dir.c +++ b/file_io/unix/dir.c @@ -95,8 +95,8 @@ apr_status_t apr_dir_open(apr_dir_t **new, const char *dirname, apr_pool_t *cont return errno; } else { - apr_register_cleanup((*new)->cntxt, (void *)(*new), dir_cleanup, - apr_null_cleanup); + apr_pool_cleanup_register((*new)->cntxt, (void *)(*new), dir_cleanup, + apr_pool_cleanup_null); return APR_SUCCESS; } } @@ -106,7 +106,7 @@ apr_status_t apr_dir_close(apr_dir_t *thedir) apr_status_t rv; if ((rv = dir_cleanup(thedir)) == APR_SUCCESS) { - apr_kill_cleanup(thedir->cntxt, thedir, dir_cleanup); + apr_pool_cleanup_kill(thedir->cntxt, thedir, dir_cleanup); return APR_SUCCESS; } return rv; @@ -195,7 +195,7 @@ apr_status_t apr_dir_rewind(apr_dir_t *thedir) return APR_SUCCESS; } -apr_status_t apr_make_dir(const char *path, apr_fileperms_t perm, apr_pool_t *cont) +apr_status_t apr_dir_make(const char *path, apr_fileperms_t perm, apr_pool_t *cont) { mode_t mode = apr_unix_perms2mode(perm); @@ -207,7 +207,7 @@ apr_status_t apr_make_dir(const char *path, apr_fileperms_t perm, apr_pool_t *co } } -apr_status_t apr_remove_dir(const char *path, apr_pool_t *cont) +apr_status_t apr_dir_remove(const char *path, apr_pool_t *cont) { if (rmdir(path) == 0) { return APR_SUCCESS; @@ -217,7 +217,7 @@ apr_status_t apr_remove_dir(const char *path, apr_pool_t *cont) } } -apr_status_t apr_get_os_dir(apr_os_dir_t **thedir, apr_dir_t *dir) +apr_status_t apr_os_dir_get(apr_os_dir_t **thedir, apr_dir_t *dir) { if (dir == NULL) { return APR_ENODIR; @@ -226,7 +226,7 @@ apr_status_t apr_get_os_dir(apr_os_dir_t **thedir, apr_dir_t *dir) return APR_SUCCESS; } -apr_status_t apr_put_os_dir(apr_dir_t **dir, apr_os_dir_t *thedir, +apr_status_t apr_os_dir_put(apr_dir_t **dir, apr_os_dir_t *thedir, apr_pool_t *cont) { if ((*dir) == NULL) { |