2009-06-30 Joel Sherrill <joel.sherrill@OARcorp.com>

* posix/src/prwlocktimedrdlock.c: Restructure if slightly to make to
	make it easier to analyze for coverage.
This commit is contained in:
Joel Sherrill
2009-06-30 17:54:50 +00:00
parent 94ccbb7b3d
commit d852e2342b
2 changed files with 17 additions and 11 deletions

View File

@@ -1,3 +1,8 @@
2009-06-30 Joel Sherrill <joel.sherrill@OARcorp.com>
* posix/src/prwlocktimedrdlock.c: Restructure if slightly to make to
make it easier to analyze for coverage.
2009-06-29 Joel Sherrill <joel.sherrill@oarcorp.com>
* posix/src/killinfo.c, posix/src/mutexinit.c, posix/src/psignal.c,

View File

@@ -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(