From ed553f0bcf6e1fd21e58714c8bd065b597f061af Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 21 Oct 2010 22:21:09 +0000 Subject: 2010-10-21 Joel Sherrill * posix/src/mutextimedlock.c: Check status local variable not lock_status. --- cpukit/ChangeLog | 5 +++++ cpukit/posix/src/mutextimedlock.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'cpukit') diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index cc780451a8..8a3a1a4b48 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2010-10-21 Joel Sherrill + + * posix/src/mutextimedlock.c: Check status local variable not + lock_status. + 2010-10-19 Sebastian Huber * libnetworking/lib/ftpfs.c: Do not fall back to BOOTP server address diff --git a/cpukit/posix/src/mutextimedlock.c b/cpukit/posix/src/mutextimedlock.c index 576eba9eb8..7773d84af6 100644 --- a/cpukit/posix/src/mutextimedlock.c +++ b/cpukit/posix/src/mutextimedlock.c @@ -72,10 +72,10 @@ int pthread_mutex_timedlock( * make sure the right reason is returned. */ if ( !do_wait && (lock_status == EBUSY) ) { - if ( lock_status == POSIX_ABSOLUTE_TIMEOUT_INVALID ) + if ( status == POSIX_ABSOLUTE_TIMEOUT_INVALID ) return EINVAL; - if ( lock_status == POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST || - lock_status == POSIX_ABSOLUTE_TIMEOUT_IS_NOW ) + if ( status == POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST || + status == POSIX_ABSOLUTE_TIMEOUT_IS_NOW ) return ETIMEDOUT; } -- cgit v1.2.3