X-Git-Url: http://git.liburcu.org/?p=userspace-rcu.git;a=blobdiff_plain;f=compat_futex.c;h=6fe378f965d4407734fe16f3ffcc8ff8eb4afbb1;hp=a3571343ca37d086e77620da1ed0dd5e9fd71778;hb=refs%2Fheads%2Fstable-0.7;hpb=11eb040f24e020d05d65983d0f87f79b000c7b9f diff --git a/compat_futex.c b/compat_futex.c index a357134..6fe378f 100644 --- a/compat_futex.c +++ b/compat_futex.c @@ -54,7 +54,7 @@ pthread_cond_t __urcu_compat_futex_cond = PTHREAD_COND_INITIALIZER; int compat_futex_noasync(int32_t *uaddr, int op, int32_t val, const struct timespec *timeout, int32_t *uaddr2, int32_t val3) { - int ret; + int ret = 0, lockret; /* * Check if NULL. Don't let users expect that they are taken into @@ -69,9 +69,9 @@ int compat_futex_noasync(int32_t *uaddr, int op, int32_t val, */ cmm_smp_mb(); - ret = pthread_mutex_lock(&__urcu_compat_futex_lock); - if (ret) { - errno = ret; + lockret = pthread_mutex_lock(&__urcu_compat_futex_lock); + if (lockret) { + errno = lockret; ret = -1; goto end; } @@ -98,9 +98,9 @@ int compat_futex_noasync(int32_t *uaddr, int op, int32_t val, errno = EINVAL; ret = -1; } - ret = pthread_mutex_unlock(&__urcu_compat_futex_lock); - if (ret) { - errno = ret; + lockret = pthread_mutex_unlock(&__urcu_compat_futex_lock); + if (lockret) { + errno = lockret; ret = -1; } end: