Merge r1775069 from trunk:

proc_mutex_pthread: simplify (shorten) methods' names by removing
the second/double proc_ (consistently with other mechanisms).



git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1775071 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 21 insertions, 21 deletions

diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c
index dd6c6b0ab..b8eb38269 100644
--- a/locks/unix/proc_mutex.c
+++ b/locks/unix/proc_mutex.c
@@ -384,7 +384,7 @@ static apr_status_t proc_pthread_mutex_unref(void *mutex_)
     return APR_SUCCESS;
 }
 
-static apr_status_t proc_mutex_proc_pthread_cleanup(void *mutex_)
+static apr_status_t proc_mutex_pthread_cleanup(void *mutex_)
 {
     apr_proc_mutex_t *mutex=mutex_;
     apr_status_t rv;
@@ -401,8 +401,8 @@ static apr_status_t proc_mutex_proc_pthread_cleanup(void *mutex_)
     return APR_SUCCESS;
 }
 
-static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex,
-                                                   const char *fname)
+static apr_status_t proc_mutex_pthread_create(apr_proc_mutex_t *new_mutex,
+                                              const char *fname)
 {
     apr_status_t rv;
     int fd;
@@ -430,14 +430,14 @@ static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex,
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
+        proc_mutex_pthread_cleanup(new_mutex);
         return rv;
     }
     if ((rv = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED))) {
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
+        proc_mutex_pthread_cleanup(new_mutex);
         pthread_mutexattr_destroy(&mattr);
         return rv;
     }
@@ -448,7 +448,7 @@ static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex,
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
+        proc_mutex_pthread_cleanup(new_mutex);
         pthread_mutexattr_destroy(&mattr);
         return rv;
     }
@@ -456,7 +456,7 @@ static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex,
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
+        proc_mutex_pthread_cleanup(new_mutex);
         pthread_mutexattr_destroy(&mattr);
         return rv;
     }
@@ -466,7 +466,7 @@ static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex,
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
+        proc_mutex_pthread_cleanup(new_mutex);
         pthread_mutexattr_destroy(&mattr);
         return rv;
     }
@@ -478,7 +478,7 @@ static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex,
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
+        proc_mutex_pthread_cleanup(new_mutex);
         return rv;
     }
 
@@ -489,9 +489,9 @@ static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex,
     return APR_SUCCESS;
 }
 
-static apr_status_t proc_mutex_proc_pthread_child_init(apr_proc_mutex_t **mutex,
-                                                       apr_pool_t *pool, 
-                                                       const char *fname)
+static apr_status_t proc_mutex_pthread_child_init(apr_proc_mutex_t **mutex,
+                                                  apr_pool_t *pool, 
+                                                  const char *fname)
 {
     (*mutex)->curr_locked = 0;
     if (proc_pthread_mutex_inc(*mutex)) {
@@ -501,7 +501,7 @@ static apr_status_t proc_mutex_proc_pthread_child_init(apr_proc_mutex_t **mutex,
     return APR_SUCCESS;
 }
 
-static apr_status_t proc_mutex_proc_pthread_acquire(apr_proc_mutex_t *mutex)
+static apr_status_t proc_mutex_pthread_acquire(apr_proc_mutex_t *mutex)
 {
     apr_status_t rv;
 
@@ -523,7 +523,7 @@ static apr_status_t proc_mutex_proc_pthread_acquire(apr_proc_mutex_t *mutex)
     return APR_SUCCESS;
 }
 
-static apr_status_t proc_mutex_proc_pthread_tryacquire(apr_proc_mutex_t *mutex)
+static apr_status_t proc_mutex_pthread_tryacquire(apr_proc_mutex_t *mutex)
 {
     apr_status_t rv;
  
@@ -548,7 +548,7 @@ static apr_status_t proc_mutex_proc_pthread_tryacquire(apr_proc_mutex_t *mutex)
     return APR_SUCCESS;
 }
 
-static apr_status_t proc_mutex_proc_pthread_release(apr_proc_mutex_t *mutex)
+static apr_status_t proc_mutex_pthread_release(apr_proc_mutex_t *mutex)
 {
     apr_status_t rv;
 
@@ -565,12 +565,12 @@ static apr_status_t proc_mutex_proc_pthread_release(apr_proc_mutex_t *mutex)
 static const apr_proc_mutex_unix_lock_methods_t mutex_proc_pthread_methods =
 {
     APR_PROCESS_LOCK_MECH_IS_GLOBAL,
-    proc_mutex_proc_pthread_create,
-    proc_mutex_proc_pthread_acquire,
-    proc_mutex_proc_pthread_tryacquire,
-    proc_mutex_proc_pthread_release,
-    proc_mutex_proc_pthread_cleanup,
-    proc_mutex_proc_pthread_child_init,
+    proc_mutex_pthread_create,
+    proc_mutex_pthread_acquire,
+    proc_mutex_pthread_tryacquire,
+    proc_mutex_pthread_release,
+    proc_mutex_pthread_cleanup,
+    proc_mutex_pthread_child_init,
     "pthread"
 };