diff options
| author | dougm <dougm@13f79535-47bb-0310-9956-ffa450edef68> | 2001-02-08 07:45:23 +0000 |
|---|---|---|
| committer | dougm <dougm@13f79535-47bb-0310-9956-ffa450edef68> | 2001-02-08 07:45:23 +0000 |
| commit | aba88e6ebce8d24a8ca387c28aabc9f17559a56c (patch) | |
| tree | 136752321dd3e22c22463c9ab35a700ab0507729 /mmap | |
| parent | 482ce86a79d41d751123dcfcfc29f4098135c4b7 (diff) | |
| download | libapr-aba88e6ebce8d24a8ca387c28aabc9f17559a56c.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: http://svn.apache.org/repos/asf/apr/apr/trunk@61194 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'mmap')
| -rw-r--r-- | mmap/unix/mmap.c | 8 | ||||
| -rw-r--r-- | mmap/win32/mmap.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mmap/unix/mmap.c b/mmap/unix/mmap.c index 948fc680a..09ae1da01 100644 --- a/mmap/unix/mmap.c +++ b/mmap/unix/mmap.c @@ -120,7 +120,7 @@ apr_status_t apr_mmap_create(apr_mmap_t **new, apr_file_t *file, #ifdef BEOS /* XXX: mmap shouldn't really change the seek offset */ - apr_seek(file, APR_SET, &offset); + apr_file_seek(file, APR_SET, &offset); if (flag & APR_MMAP_WRITE) { native_flags |= B_WRITE_AREA; } @@ -166,8 +166,8 @@ apr_status_t apr_mmap_create(apr_mmap_t **new, apr_file_t *file, (*new)->cntxt = cont; /* register the cleanup... */ - apr_register_cleanup((*new)->cntxt, (void*)(*new), mmap_cleanup, - apr_null_cleanup); + apr_pool_cleanup_register((*new)->cntxt, (void*)(*new), mmap_cleanup, + apr_pool_cleanup_null); return APR_SUCCESS; } @@ -179,7 +179,7 @@ apr_status_t apr_mmap_delete(apr_mmap_t *mmap) return APR_ENOENT; if ((rv = mmap_cleanup(mmap)) == APR_SUCCESS) { - apr_kill_cleanup(mmap->cntxt, mmap, mmap_cleanup); + apr_pool_cleanup_kill(mmap->cntxt, mmap, mmap_cleanup); return APR_SUCCESS; } return rv; diff --git a/mmap/win32/mmap.c b/mmap/win32/mmap.c index 28c522469..b42ab98e8 100644 --- a/mmap/win32/mmap.c +++ b/mmap/win32/mmap.c @@ -147,8 +147,8 @@ APR_DECLARE(apr_status_t) apr_mmap_create(apr_mmap_t **new, apr_file_t *file, (*new)->cntxt = cont; /* register the cleanup... */ - apr_register_cleanup((*new)->cntxt, (void*)(*new), mmap_cleanup, - apr_null_cleanup); + apr_pool_cleanup_register((*new)->cntxt, (void*)(*new), mmap_cleanup, + apr_pool_cleanup_null); return APR_SUCCESS; } @@ -157,7 +157,7 @@ APR_DECLARE(apr_status_t) apr_mmap_delete(apr_mmap_t *mmap) apr_status_t rv; if ((rv = mmap_cleanup(mmap)) == APR_SUCCESS) { - apr_kill_cleanup(mmap->cntxt, mmap, mmap_cleanup); + apr_pool_cleanup_kill(mmap->cntxt, mmap, mmap_cleanup); return APR_SUCCESS; } return rv; |