This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-744-gfac9916
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 21 Nov 2012 20:00:23 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-744-gfac9916
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 fac9916c962ffa03350322d616c44f07467850eb (commit)
from c3151ad1004f97b8595449c8ed9af01c5d58906f (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=fac9916c962ffa03350322d616c44f07467850eb
commit fac9916c962ffa03350322d616c44f07467850eb
Author: Joseph Myers <joseph@codesourcery.com>
Date: Wed Nov 21 20:00:11 2012 +0000
Remove unused variable from pthread_cond_timedwait.c.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 48aa6da..745accd 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-21 Joseph Myers <joseph@codesourcery.com>
+
+ * pthread_cond_timedwait.c (__pthread_cond_timedwait)
+ [__NR_clock_gettime]: Cast result of INTERNAL_VSYSCALL to void
+ instead of storing in otherwise-unused variable.
+
2012-11-14 Marcus Shawcroft <marcus.shawcroft@linaro.org>
* Makefile (CFLAGS-open.c, CFLAGS-open64.c, CFLAGS-pause.c)
diff --git a/nptl/pthread_cond_timedwait.c b/nptl/pthread_cond_timedwait.c
index 2fcbc57..ef33b96 100644
--- a/nptl/pthread_cond_timedwait.c
+++ b/nptl/pthread_cond_timedwait.c
@@ -115,11 +115,10 @@ __pthread_cond_timedwait (cond, mutex, abstime)
{
# ifdef __NR_clock_gettime
INTERNAL_SYSCALL_DECL (err);
- int ret;
- ret = INTERNAL_VSYSCALL (clock_gettime, err, 2,
- (cond->__data.__nwaiters
- & ((1 << COND_NWAITERS_SHIFT) - 1)),
- &rt);
+ (void) INTERNAL_VSYSCALL (clock_gettime, err, 2,
+ (cond->__data.__nwaiters
+ & ((1 << COND_NWAITERS_SHIFT) - 1)),
+ &rt);
/* Convert the absolute timeout value to a relative timeout. */
rt.tv_sec = abstime->tv_sec - rt.tv_sec;
rt.tv_nsec = abstime->tv_nsec - rt.tv_nsec;
-----------------------------------------------------------------------
Summary of changes:
nptl/ChangeLog | 6 ++++++
nptl/pthread_cond_timedwait.c | 9 ++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
hooks/post-receive
--
GNU C Library master sources