diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-06-21 16:38:47 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-06-21 16:38:47 +0000 |
| commit | 18cf72767e91b71b9d4ebbce260d30458de67c43 (patch) | |
| tree | d0e72848e232bea0be525e84caca11fdef57eadd | |
| parent | Upgrade to 4.8.2 (diff) | |
| download | rtems-18cf72767e91b71b9d4ebbce260d30458de67c43.tar.bz2 | |
2010-06-21 Peter Dufault <dufault@hda.com>
PR 1570/cpukit
* posix/src/semtimedwait.c: This routine is supposed to return -1/errno
NOT the status directly.
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/posix/src/semtimedwait.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 964f3b8ddf..38c4c3389c 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2010-06-21 Peter Dufault <dufault@hda.com> + + PR 1570/cpukit + * posix/src/semtimedwait.c: This routine is supposed to return -1/errno + NOT the status directly. + 2009-12-10 Joel Sherrill <joel.sherrill@OARcorp.com> PR 1482 diff --git a/cpukit/posix/src/semtimedwait.c b/cpukit/posix/src/semtimedwait.c index 25457448aa..4561c9a96a 100644 --- a/cpukit/posix/src/semtimedwait.c +++ b/cpukit/posix/src/semtimedwait.c @@ -76,10 +76,10 @@ int sem_timedwait( if ( !do_wait && (lock_status == EBUSY) ) { switch (lock_status) { case POSIX_ABSOLUTE_TIMEOUT_INVALID: - return EINVAL; + rtems_set_errno_and_return_minus_one( EINVAL ); case POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST: case POSIX_ABSOLUTE_TIMEOUT_IS_NOW: - return ETIMEDOUT; + rtems_set_errno_and_return_minus_one( ETIMEDOUT ); case POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE: break; } |