This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.15-312-g840df61


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  840df61ea4e9bc587a1cb8b3787364d650a7d29e (commit)
      from  a14d08425029c54d0d9dd7545099b01e7175ab1b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=840df61ea4e9bc587a1cb8b3787364d650a7d29e

commit 840df61ea4e9bc587a1cb8b3787364d650a7d29e
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Wed Mar 7 04:11:11 2012 -0500

    Get rid of superfluous assignments in sem_timedwait

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 53b8ad1..73394b9 100644
--- 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 903830e..36e0042 100644
--- 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 7b4e824..8e56bc9 100644
--- 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 5da1574..c9fcd59 100644
--- 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);

-----------------------------------------------------------------------

Summary of changes:
 nptl/ChangeLog                                     |    9 +++++++++
 nptl/sysdeps/unix/sysv/linux/sem_timedwait.c       |    3 +--
 nptl/sysdeps/unix/sysv/linux/sparc/sem_timedwait.c |    3 +--
 .../unix/sysv/linux/sparc/sparc32/sem_timedwait.c  |    3 +--
 4 files changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]