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.14-438-g485683c
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 25 Oct 2011 01:43:56 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-438-g485683c
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 485683c35f020bd8b926e9673adb9b748380e8ce (commit)
from a0cf1edd4cf2b3bf1ec2f772b47c8eaafd899383 (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=485683c35f020bd8b926e9673adb9b748380e8ce
commit 485683c35f020bd8b926e9673adb9b748380e8ce
Author: Ulrich Drepper <drepper@gmail.com>
Date: Mon Oct 24 21:43:33 2011 -0400
Remove warnings in NPTL tests
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 7b06763..f4b2f04 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-24 Ulrich Drepper <drepper@gmail.com>
+
+ * tst-cancel7.c: Avoid warning.
+ * tst-mutex6.c: Likewise.
+ * tst-mutex9.c: Likewise.
+ * tst-mutexpi6.c: Likewise.
+
2011-10-23 Ulrich Drepper <drepper@gmail.com>
* sysdeps/i386/tls.h: Remove #include <list.h>.
diff --git a/nptl/tst-cancel7.c b/nptl/tst-cancel7.c
index be9b1c6..af0d18f 100644
--- a/nptl/tst-cancel7.c
+++ b/nptl/tst-cancel7.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
@@ -204,7 +204,7 @@ do_cleanup (void)
case OPT_PIDFILE: \
pidfile = optarg; \
break;
-// #define CLEANUP_HANDLER do_cleanup ()
+#define CLEANUP_HANDLER do_cleanup ()
#define PREPARE(argc, argv) do_prepare (argc, argv)
#define TEST_FUNCTION do_test ()
#define TIMEOUT 5
diff --git a/nptl/tst-mutex6.c b/nptl/tst-mutex6.c
index de64bdb..19611ee 100644
--- a/nptl/tst-mutex6.c
+++ b/nptl/tst-mutex6.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2006, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -25,7 +25,8 @@
#ifndef ATTR
-# define ATTR NULL
+pthread_mutexattr_t *attr;
+# define ATTR attr
#endif
diff --git a/nptl/tst-mutex9.c b/nptl/tst-mutex9.c
index f9d3793..bdf1dc8 100644
--- a/nptl/tst-mutex9.c
+++ b/nptl/tst-mutex9.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2006, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
@@ -37,7 +37,6 @@ do_test (void)
pthread_mutex_t *m;
pthread_mutexattr_t a;
pid_t pid;
- char *p;
fd = mkstemp (tmpfname);
if (fd == -1)
@@ -68,7 +67,6 @@ do_test (void)
m = (pthread_mutex_t *) (((uintptr_t) mem + __alignof (pthread_mutex_t))
& ~(__alignof (pthread_mutex_t) - 1));
- p = (char *) (m + 1);
if (pthread_mutexattr_init (&a) != 0)
{
diff --git a/nptl/tst-mutexpi6.c b/nptl/tst-mutexpi6.c
index 42cda37..8881a1d 100644
--- a/nptl/tst-mutexpi6.c
+++ b/nptl/tst-mutexpi6.c
@@ -3,11 +3,13 @@
#include <stdlib.h>
-static pthread_mutexattr_t a;
+pthread_mutexattr_t a;
+pthread_mutexattr_t *attr;
static void
prepare (void)
{
+ attr = &a;
if (pthread_mutexattr_init (&a) != 0)
{
puts ("mutexattr_init failed");
@@ -23,5 +25,5 @@ prepare (void)
#define PREPARE(argc, argv) prepare ()
-#define ATTR &a
+#define ATTR attr
#include "tst-mutex6.c"
-----------------------------------------------------------------------
Summary of changes:
nptl/ChangeLog | 7 +++++++
nptl/tst-cancel7.c | 4 ++--
nptl/tst-mutex6.c | 5 +++--
nptl/tst-mutex9.c | 4 +---
nptl/tst-mutexpi6.c | 6 ++++--
5 files changed, 17 insertions(+), 9 deletions(-)
hooks/post-receive
--
GNU C Library master sources