summaryrefslogtreecommitdiff
path: root/locks
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2002-11-21 16:28:08 +0000
committerJeff Trawick <trawick@apache.org>2002-11-21 16:28:08 +0000
commitf5193956f14194721b4970992ac15a46cfa5cc9d (patch)
treeca4aabed7de6d4b95784839f462c17264a9ab078 /locks
parent782c95687a94c80fd5570b2e3440ec859f7ebcce (diff)
downloadapr-f5193956f14194721b4970992ac15a46cfa5cc9d.tar.gz
axe the remaining proc_mutex_FOO_destroy() functions, which are
no longer used git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@64054 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks')
-rw-r--r--locks/unix/proc_mutex.c45
1 files changed, 1 insertions, 44 deletions
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c
index 2a2a1b301..2c33c85d0 100644
--- a/locks/unix/proc_mutex.c
+++ b/locks/unix/proc_mutex.c
@@ -262,17 +262,6 @@ static apr_status_t proc_mutex_sysv_release(apr_proc_mutex_t *mutex)
return APR_SUCCESS;
}
-static apr_status_t proc_mutex_sysv_destroy(apr_proc_mutex_t *mutex)
-{
- apr_status_t rv;
-
- if ((rv = proc_mutex_sysv_cleanup(mutex)) == APR_SUCCESS) {
- apr_pool_cleanup_kill(mutex->pool, mutex, proc_mutex_sysv_cleanup);
- return APR_SUCCESS;
- }
- return rv;
-}
-
static apr_status_t proc_mutex_sysv_child_init(apr_proc_mutex_t **mutex, apr_pool_t *cont, const char *fname)
{
return APR_SUCCESS;
@@ -438,18 +427,6 @@ static apr_status_t proc_mutex_proc_pthread_release(apr_proc_mutex_t *mutex)
return APR_SUCCESS;
}
-static apr_status_t proc_mutex_proc_pthread_destroy(apr_proc_mutex_t *mutex)
-{
- apr_status_t rv;
- if ((rv = proc_mutex_proc_pthread_cleanup(mutex)) == APR_SUCCESS) {
- apr_pool_cleanup_kill(mutex->pool,
- mutex,
- proc_mutex_proc_pthread_cleanup);
- return APR_SUCCESS;
- }
- return rv;
-}
-
static apr_status_t proc_mutex_proc_pthread_child_init(apr_proc_mutex_t **mutex,
apr_pool_t *cont,
const char *fname)
@@ -572,16 +549,6 @@ static apr_status_t proc_mutex_fcntl_release(apr_proc_mutex_t *mutex)
return APR_SUCCESS;
}
-static apr_status_t proc_mutex_fcntl_destroy(apr_proc_mutex_t *mutex)
-{
- apr_status_t rv;
- if ((rv = proc_mutex_fcntl_cleanup(mutex)) == APR_SUCCESS) {
- apr_pool_cleanup_kill(mutex->pool, mutex, proc_mutex_fcntl_cleanup);
- return APR_SUCCESS;
- }
- return rv;
-}
-
static apr_status_t proc_mutex_fcntl_child_init(apr_proc_mutex_t **mutex,
apr_pool_t *pool,
const char *fname)
@@ -687,16 +654,6 @@ static apr_status_t proc_mutex_flock_release(apr_proc_mutex_t *mutex)
return APR_SUCCESS;
}
-static apr_status_t proc_mutex_flock_destroy(apr_proc_mutex_t *mutex)
-{
- apr_status_t rv;
- if ((rv = proc_mutex_flock_cleanup(mutex)) == APR_SUCCESS) {
- apr_pool_cleanup_kill(mutex->pool, mutex, proc_mutex_flock_cleanup);
- return APR_SUCCESS;
- }
- return rv;
-}
-
static apr_status_t proc_mutex_flock_child_init(apr_proc_mutex_t **mutex,
apr_pool_t *pool,
const char *fname)
@@ -712,7 +669,7 @@ static apr_status_t proc_mutex_flock_child_init(apr_proc_mutex_t **mutex,
rv = apr_file_open(&new_mutex->interproc, new_mutex->fname,
APR_WRITE, 0, new_mutex->pool);
if (rv != APR_SUCCESS) {
- proc_mutex_flock_destroy(new_mutex);
+ proc_mutex_flock_cleanup(new_mutex);
return rv;
}
*mutex = new_mutex;