diff options
| author | Elliott Hughes <enh@google.com> | 2013-12-18 18:06:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-18 18:06:17 +0000 |
| commit | d2bcbf0dbec86b8f27b1b3d939025098f134ea60 (patch) | |
| tree | 5901c5b3dd3eb00353ac1233f1506aa266a92221 /libc | |
| parent | 611b903ca7ba9d604a9e2ebc1efa5a66f7ccc049 (diff) | |
| parent | 9e79af3b61b5a617c537862ebe72248beff58f19 (diff) | |
| download | bionic-d2bcbf0dbec86b8f27b1b3d939025098f134ea60.zip bionic-d2bcbf0dbec86b8f27b1b3d939025098f134ea60.tar.gz bionic-d2bcbf0dbec86b8f27b1b3d939025098f134ea60.tar.bz2 | |
Merge "Small style cleanup."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/bionic/pthread_cond.cpp | 2 | ||||
| -rw-r--r-- | libc/bionic/pthread_mutex.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libc/bionic/pthread_cond.cpp b/libc/bionic/pthread_cond.cpp index 7c229b5..4583cef 100644 --- a/libc/bionic/pthread_cond.cpp +++ b/libc/bionic/pthread_cond.cpp @@ -154,7 +154,7 @@ int __pthread_cond_timedwait_relative(pthread_cond_t* cond, pthread_mutex_t* mut int status = __futex_wait_ex(&cond->value, COND_IS_SHARED(cond), old_value, reltime); pthread_mutex_lock(mutex); - if (status == (-ETIMEDOUT)) { + if (status == -ETIMEDOUT) { return ETIMEDOUT; } return 0; diff --git a/libc/bionic/pthread_mutex.cpp b/libc/bionic/pthread_mutex.cpp index 11a66ab..0d992b3 100644 --- a/libc/bionic/pthread_mutex.cpp +++ b/libc/bionic/pthread_mutex.cpp @@ -783,7 +783,7 @@ int pthread_mutex_lock_timeout_np_impl(pthread_mutex_t *mutex, unsigned msecs) * thread. */ if (MUTEX_STATE_BITS_IS_LOCKED_CONTENDED(mvalue)) { - if (__futex_wait_ex(&mutex->value, shared, mvalue, &ts) == (-ETIMEDOUT)) { + if (__futex_wait_ex(&mutex->value, shared, mvalue, &ts) == -ETIMEDOUT) { return EBUSY; } mvalue = mutex->value; |