From c8114d9b8b837fcd7e9ba83fd3d676bd2a70edb9 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sun, 13 Sep 2015 20:47:10 -0400 Subject: [PATCH] Fix: compat_futex_noasync: don't override return value Fix error reported by Coverity: ** CID 1324336: Code maintainability issues (UNUSED_VALUE) /compat_futex.c: 99 in compat_futex_noasync() Signed-off-by: Mathieu Desnoyers --- compat_futex.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/compat_futex.c b/compat_futex.c index a357134..0cc2956 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, 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: -- 2.34.1