diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-10-10 15:21:41 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-10-10 15:21:41 +0000 |
| commit | 6805ac371836bdb1114869cdf4e229cde248ff97 (patch) | |
| tree | b766cc34cde1f527a43f6e11e22c4fb48eea2c40 /cpukit/posix/src/semtimedwait.c | |
| parent | 2009-10-10 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-6805ac371836bdb1114869cdf4e229cde248ff97.tar.bz2 | |
2009-10-10 Joel Sherrill <joel.sherrill@oarcorp.com>
* posix/src/mqueuetimedreceive.c, posix/src/mqueuetimedsend.c,
posix/src/mutextimedlock.c, posix/src/prwlocktimedrdlock.c,
posix/src/prwlocktimedwrlock.c, posix/src/semtimedwait.c: Switch from
switch to if's because only one value needed to be tested. This
shrinks the code and makes it easier to do coverage analysis on.
Diffstat (limited to 'cpukit/posix/src/semtimedwait.c')
| -rw-r--r-- | cpukit/posix/src/semtimedwait.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/cpukit/posix/src/semtimedwait.c b/cpukit/posix/src/semtimedwait.c index 1d8874a27b..33c38ddbd0 100644 --- a/cpukit/posix/src/semtimedwait.c +++ b/cpukit/posix/src/semtimedwait.c @@ -52,18 +52,14 @@ int sem_timedwait( * is valid or not. If it isn't correct and in the future, * then we do a polling operation and convert the UNSATISFIED * status into the appropriate error. + * + * If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID, + * POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST, or POSIX_ABSOLUTE_TIMEOUT_IS_NOW, + * then we should not wait. */ status = _POSIX_Absolute_timeout_to_ticks( abstime, &ticks ); - switch ( status ) { - case POSIX_ABSOLUTE_TIMEOUT_INVALID: - case POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST: - case POSIX_ABSOLUTE_TIMEOUT_IS_NOW: - do_wait = false; - break; - case POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE: - do_wait = true; - break; - } + if ( status != POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE ) + do_wait = false; lock_status = _POSIX_Semaphore_Wait_support( sem, do_wait, ticks ); |