From d8af86bf226a7af9df37405ed726cb3050468e6a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 21 Jun 2010 16:38:26 +0000 Subject: [PATCH] 2010-06-21 Peter Dufault PR 1570/cpukit * posix/src/semtimedwait.c: This routine is supposed to return -1/errno NOT the status directly. --- cpukit/ChangeLog | 6 ++++++ cpukit/posix/src/semtimedwait.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 8f02225593..5f58b3f62a 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2010-06-21 Peter Dufault + + PR 1570/cpukit + * posix/src/semtimedwait.c: This routine is supposed to return -1/errno + NOT the status directly. + 2010-06-21 Joel Sherrill PR 1554/cpukit diff --git a/cpukit/posix/src/semtimedwait.c b/cpukit/posix/src/semtimedwait.c index 58d3bcea09..8d7a8fd5e5 100644 --- a/cpukit/posix/src/semtimedwait.c +++ b/cpukit/posix/src/semtimedwait.c @@ -72,10 +72,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; }