summaryrefslogtreecommitdiff
path: root/shmem/unix
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2002-04-16 20:25:57 +0000
committerJeff Trawick <trawick@apache.org>2002-04-16 20:25:57 +0000
commit12aa3beb694cc62f117c3d0a6c6592a6bb626abd (patch)
treedf52eada4549d124ff2dd1534d358de4be940d52 /shmem/unix
parent6196ac2da73233908deff8877058b9c9a5e1d753 (diff)
downloadapr-12aa3beb694cc62f117c3d0a6c6592a6bb626abd.tar.gz
standardize some apr_foo_close() functions (call apr_pool_cleanup_run())
a couple of these functions didn't kill the cleanup if it failed; we might as well; the error isn't going to magically disappear next time we try git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@63272 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'shmem/unix')
-rw-r--r--shmem/unix/shm.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/shmem/unix/shm.c b/shmem/unix/shm.c
index 6c41dd59a..a190ef5ca 100644
--- a/shmem/unix/shm.c
+++ b/shmem/unix/shm.c
@@ -418,9 +418,7 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m)
{
- apr_status_t rv = shm_cleanup_owner(m);
- apr_pool_cleanup_kill(m->pool, m, shm_cleanup_owner);
- return rv;
+ return apr_pool_cleanup_run(m->pool, m, shm_cleanup_owner);
}
static apr_status_t shm_cleanup_attach(void *m_)