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 <mathieu.desnoyers@efficios.com>

diff --git a/compat_futex.c b/compat_futex.c
index a3571343ca37d086e77620da1ed0dd5e9fd71778..0cc2956b66bcf35a5fe0786844e9d133743e6690 100644 (file)
--- 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 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
 
        /*
         * 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();
 
         */
        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;
        }
                ret = -1;
                goto end;
        }


@@ -98,9 +98,9 @@ int compat_futex_noasync(int32_t *uaddr, int op, int32_t val,
                errno = EINVAL;
                ret = -1;
        }
                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:
                ret = -1;
        }
 end: