diff options
author | Yann Ylavic <ylavic@apache.org> | 2017-04-25 15:35:55 +0000 |
---|---|---|
committer | Yann Ylavic <ylavic@apache.org> | 2017-04-25 15:35:55 +0000 |
commit | 7705c702beaedc10de440035cb2ea8d128aebcba (patch) | |
tree | 7e4490d3c4908c25b86c68b10c2f876ce3f57359 /locks | |
parent | f117917f20b3d45fe78e0770a31d1e054ca880aa (diff) | |
download | apr-7705c702beaedc10de440035cb2ea8d128aebcba.tar.gz |
locks: unix: follow up to r1792622.
Indent block previously preserved (for easier review), no functional change.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1792625 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks')
-rw-r--r-- | locks/unix/proc_mutex.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c index a96e27acd..a8002c6bd 100644 --- a/locks/unix/proc_mutex.c +++ b/locks/unix/proc_mutex.c @@ -717,30 +717,30 @@ static apr_status_t proc_mutex_pthread_acquire_ex(apr_proc_mutex_t *mutex, proc_pthread_mutex_cond_num_waiters(mutex)++; do { - if (timeout < 0) { - rv = pthread_cond_wait(&proc_pthread_mutex_cond(mutex), - &proc_pthread_mutex(mutex)); - if (rv) { + if (timeout < 0) { + rv = pthread_cond_wait(&proc_pthread_mutex_cond(mutex), + &proc_pthread_mutex(mutex)); + if (rv) { #ifdef HAVE_ZOS_PTHREADS - rv = errno; + rv = errno; #endif - break; + break; + } } - } - else { - rv = pthread_cond_timedwait(&proc_pthread_mutex_cond(mutex), - &proc_pthread_mutex(mutex), - &abstime); - if (rv) { + else { + rv = pthread_cond_timedwait(&proc_pthread_mutex_cond(mutex), + &proc_pthread_mutex(mutex), + &abstime); + if (rv) { #ifdef HAVE_ZOS_PTHREADS - rv = errno; + rv = errno; #endif - if (rv == ETIMEDOUT) { - rv = APR_TIMEUP; + if (rv == ETIMEDOUT) { + rv = APR_TIMEUP; + } + break; } - break; } - } } while (proc_pthread_mutex_cond_locked(mutex)); proc_pthread_mutex_cond_num_waiters(mutex)--; } |