generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 42513bf8: am 78ce7cbf: am d2bcbf0d: Merge "Small style cleanup."

Browse Source 
* commit '42513bf8482fdb896f72d0d882973ebc4ade9aa2':
  Small style cleanup.
This commit is contained in:
Elliott Hughes 2013-12-18 18:22:00 +00:00 committed by Android Git Automerger
commit a0c2cc7009
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/bionic/pthread_cond.cpp
View File

@ -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); int status = __futex_wait_ex(&cond->value, COND_IS_SHARED(cond), old_value, reltime);
pthread_mutex_lock(mutex); pthread_mutex_lock(mutex);
if (status == (-ETIMEDOUT)) { if (status == -ETIMEDOUT) {
return ETIMEDOUT; return ETIMEDOUT;
} }
return 0; return 0;

2
libc/bionic/pthread_mutex.cpp
View File

@ -783,7 +783,7 @@ int pthread_mutex_lock_timeout_np_impl(pthread_mutex_t *mutex, unsigned msecs)
* thread. * thread.
*/ */
if (MUTEX_STATE_BITS_IS_LOCKED_CONTENDED(mvalue)) { 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; return EBUSY;
} }
mvalue = mutex->value; mvalue = mutex->value;