From d852e2342b89d4e842698cb92de3cf2fc98b9b79 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 30 Jun 2009 17:54:50 +0000 Subject: 2009-06-30 Joel Sherrill * posix/src/prwlocktimedrdlock.c: Restructure if slightly to make to make it easier to analyze for coverage. --- cpukit/posix/src/prwlocktimedrdlock.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'cpukit/posix') diff --git a/cpukit/posix/src/prwlocktimedrdlock.c b/cpukit/posix/src/prwlocktimedrdlock.c index dfd2124bfa..2b55da7294 100644 --- a/cpukit/posix/src/prwlocktimedrdlock.c +++ b/cpukit/posix/src/prwlocktimedrdlock.c @@ -85,17 +85,18 @@ int pthread_rwlock_timedrdlock( ); _Thread_Enable_dispatch(); - if ( !do_wait && - (_Thread_Executing->Wait.return_code == CORE_RWLOCK_UNAVAILABLE) ) { - switch (status) { - case POSIX_ABSOLUTE_TIMEOUT_INVALID: - return EINVAL; - case POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST: - case POSIX_ABSOLUTE_TIMEOUT_IS_NOW: - return ETIMEDOUT; - case POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE: - break; - } + if ( !do_wait ) { + if ( _Thread_Executing->Wait.return_code == CORE_RWLOCK_UNAVAILABLE ) { + switch (status) { + case POSIX_ABSOLUTE_TIMEOUT_INVALID: + return EINVAL; + case POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST: + case POSIX_ABSOLUTE_TIMEOUT_IS_NOW: + return ETIMEDOUT; + case POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE: + break; + } + } } return _POSIX_RWLock_Translate_core_RWLock_return_code( -- cgit v1.2.3