Get rid of superfluous assignments in sem_timedwait

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 53b8ad18c29bcf86148c9ef562a89b344f7d1b7f..73394b9ed6d52c8a9a482176a774ef24d7ddf306 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,12 @@
+2012-01-23  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/sem_timedwait.c (sem_timedwait): Get rid of
+       superfluous assignment.
+       * sysdeps/unix/sysv/linux/sparc/sem_timedwait.c (sem_timedwait):
+       Likewise.
+       * sysdeps/unix/sysv/linux/sparc/sparc32/sem_timedwait.c
+       (sem_timedwait): Likewise.
+
 2012-03-06  Ulrich Drepper  <drepper@gmail.com>
 
        * sysdeps/pthread/bits/libc-lock.h: Move information not needed in

diff --git a/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c b/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c
index 903830ea7e46d1ef03dbac730031c7a04dfd0126..36e00426d9c8b8d07fa2fbd234be10271c4749ba 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c
+++ b/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c
@@ -1,5 +1,5 @@
 /* sem_timedwait -- wait on a semaphore.  Generic futex-using version.
-   Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Mackerras <paulus@au.ibm.com>, 2003.
 
@@ -83,7 +83,6 @@ sem_timedwait (sem_t *sem, const struct timespec *abstime)
        }
 
       /* Already timed out?  */
-      err = -ETIMEDOUT;
       if (sec < 0)
        {
          __set_errno (ETIMEDOUT);

diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sem_timedwait.c b/nptl/sysdeps/unix/sysv/linux/sparc/sem_timedwait.c
index 7b4e8241a8701514872e75aa2c6751ffe287320f..8e56bc9c19340d571b3828c680b681a1a9bf29b3 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sem_timedwait.c
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sem_timedwait.c
@@ -1,5 +1,5 @@
 /* sem_timedwait -- wait on a semaphore.  Generic futex-using version.
-   Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Mackerras <paulus@au.ibm.com>, 2003.
 
@@ -83,7 +83,6 @@ sem_timedwait (sem_t *sem, const struct timespec *abstime)
        }
 
       /* Already timed out?  */
-      err = -ETIMEDOUT;
       if (sec < 0)
        {
          __set_errno (ETIMEDOUT);

diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_timedwait.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_timedwait.c
index 5da15742cf74a31dc1c4810ce24b3c2de3b5e8e9..c9fcd595fcb7638458ddb9b98f3f4963b2d899ed 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_timedwait.c
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_timedwait.c
@@ -1,5 +1,5 @@
 /* sem_timedwait -- wait on a semaphore.  SPARC version.
-   Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2007, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Mackerras <paulus@au.ibm.com>, 2003.
 
@@ -102,7 +102,6 @@ sem_timedwait (sem_t *sem, const struct timespec *abstime)
        }
 
       /* Already timed out?  */
-      err = -ETIMEDOUT;
       if (sec < 0)
        {
          __set_errno (ETIMEDOUT);