X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=compat_futex.c;h=b7f78f0b1c87a832cfb33c22e3a93845bbe7d3bb;hp=a3571343ca37d086e77620da1ed0dd5e9fd71778;hb=84f4ccb4bcf32c0336a0c7a3a4ba76d90d6dea1b;hpb=b0a841b4ff807dd29fe0cdbfe24900312f0e627b diff --git a/compat_futex.c b/compat_futex.c index a357134..b7f78f0 100644 --- a/compat_futex.c +++ b/compat_futex.c @@ -54,11 +54,11 @@ 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 - * account. + * account. */ assert(!timeout); assert(!uaddr2); @@ -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: @@ -120,7 +120,7 @@ int compat_futex_async(int32_t *uaddr, int op, int32_t val, /* * Check if NULL. Don't let users expect that they are taken into - * account. + * account. */ assert(!timeout); assert(!uaddr2);