diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-11-17 22:51:12 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-11-17 22:51:12 +0000 |
| commit | 44bc19a795d277ddf5d5dfa110329e7321746eaf (patch) | |
| tree | e411fa5dd00fee6b6cad4cc7283f3016346c28c3 /cpukit/posix/src/semtimedwait.c | |
| parent | 2006-11-17 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-44bc19a795d277ddf5d5dfa110329e7321746eaf.tar.bz2 | |
2006-11-17 Joel Sherrill <joel@OARcorp.com>
* posix/src/semtimedwait.c: Reverse accidentally included
semtimedwait.c.
Diffstat (limited to 'cpukit/posix/src/semtimedwait.c')
| -rw-r--r-- | cpukit/posix/src/semtimedwait.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpukit/posix/src/semtimedwait.c b/cpukit/posix/src/semtimedwait.c index 662845ecd9..b0cb78deca 100644 --- a/cpukit/posix/src/semtimedwait.c +++ b/cpukit/posix/src/semtimedwait.c @@ -48,18 +48,18 @@ int sem_timedwait( blocking = CORE_SEMAPHORE_BAD_TIMEOUT_VALUE; else #endif - if ( abstime->tv_nsec >= TOD_NANOSECONDS_PER_SECOND ) { - blocking = CORE_SEMAPHORE_BAD_TIMEOUT; - } else { - clock_gettime( CLOCK_REALTIME, ¤t_time ); + if ( abstime->tv_nsec >= TOD_NANOSECONDS_PER_SECOND ) + blocking = CORE_SEMAPHORE_BAD_TIMEOUT_VALUE; + else { + (void) clock_gettime( CLOCK_REALTIME, ¤t_time ); /* * Make sure the abstime is in the future */ if ( abstime->tv_sec < current_time.tv_sec ) - blocking = CORE_SEMAPHORE_BAD_TIMEOUT; + blocking = CORE_SEMAPHORE_BAD_TIMEOUT_VALUE; else if ( (abstime->tv_sec == current_time.tv_sec) && (abstime->tv_nsec <= current_time.tv_nsec) ) - blocking = CORE_SEMAPHORE_BAD_TIMEOUT; + blocking = CORE_SEMAPHORE_BAD_TIMEOUT_VALUE; else { _POSIX_Timespec_subtract( ¤t_time, abstime, &difference ); ticks = _POSIX_Timespec_to_interval( &difference ); |