summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Xu <davidxu@FreeBSD.org>2003-06-28 09:40:57 +0000
committerDavid Xu <davidxu@FreeBSD.org>2003-06-28 09:40:57 +0000
commita56b526b51e914143185b26ce10e48e83e1d1e06 (patch)
tree6303303f84f24cb420c450c0a88417249c6d7391
parenta07576d63c3fed5ed755df6b5c47b01f4a834a70 (diff)
Notes
-rw-r--r--lib/libkse/thread/thr_cond.c3
-rw-r--r--lib/libpthread/thread/thr_cond.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/libkse/thread/thr_cond.c b/lib/libkse/thread/thr_cond.c
index b352ba3be3c9a..59db00fc8dae5 100644
--- a/lib/libkse/thread/thr_cond.c
+++ b/lib/libkse/thread/thr_cond.c
@@ -539,8 +539,7 @@ _pthread_cond_timedwait(pthread_cond_t * cond, pthread_mutex_t * mutex,
/* The wait timedout. */
rval = ETIMEDOUT;
(void)_mutex_cv_lock(mutex);
- } else if ((interrupted == 0) ||
- (done != 0))
+ } else if (interrupted || done)
rval = _mutex_cv_lock(mutex);
}
}
diff --git a/lib/libpthread/thread/thr_cond.c b/lib/libpthread/thread/thr_cond.c
index b352ba3be3c9a..59db00fc8dae5 100644
--- a/lib/libpthread/thread/thr_cond.c
+++ b/lib/libpthread/thread/thr_cond.c
@@ -539,8 +539,7 @@ _pthread_cond_timedwait(pthread_cond_t * cond, pthread_mutex_t * mutex,
/* The wait timedout. */
rval = ETIMEDOUT;
(void)_mutex_cv_lock(mutex);
- } else if ((interrupted == 0) ||
- (done != 0))
+ } else if (interrupted || done)
rval = _mutex_cv_lock(mutex);
}
}