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-479-g3778590
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 Oct 2012 15:35:20 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-479-g3778590
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 37785907d57a771313c658c1b167b06132fb2398 (commit)
from 9485a404440e392dbcfdc157bbdf5c863f9c0fce (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=37785907d57a771313c658c1b167b06132fb2398
commit 37785907d57a771313c658c1b167b06132fb2398
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Wed Oct 17 21:02:56 2012 +0530
Don't check error return for pthread_cancel in tst-cond25
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 4553250..3b28864 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-17 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ * tst-cond25 (do_test_wait): Don't check for return value from
+ pthread_cancel.
+
2012-10-16 Siddhesh Poyarekar <siddhesh@redhat.com>
[BZ #14652]
diff --git a/nptl/tst-cond25.c b/nptl/tst-cond25.c
index 4488e74..370cd67 100644
--- a/nptl/tst-cond25.c
+++ b/nptl/tst-cond25.c
@@ -228,11 +228,7 @@ do_test_wait (thr_func f)
for (j = 0; j < NUM; j++)
{
- if ((ret = pthread_cancel (w[j])) != 0)
- {
- printf ("waiter[%d]: cancel failed: %s\n", j, strerror (ret));
- goto out;
- }
+ pthread_cancel (w[j]);
if ((ret = pthread_join (w[j], &thr_ret)) != 0)
{
-----------------------------------------------------------------------
Summary of changes:
nptl/ChangeLog | 5 +++++
nptl/tst-cond25.c | 6 +-----
2 files changed, 6 insertions(+), 5 deletions(-)
hooks/post-receive
--
GNU C Library master sources