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.20-345-g9d9c001
- From: krebbel at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 12 Dec 2014 10:14:28 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-345-g9d9c001
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 9d9c0019e750b6ef2f6d941e40a4b959c736653c (commit)
from 9173840b4dbcd1a76993f22fd9595f0ae30d5a42 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9d9c0019e750b6ef2f6d941e40a4b959c736653c
commit 9d9c0019e750b6ef2f6d941e40a4b959c736653c
Author: Stefan Liebler <stli@linux.vnet.ibm.com>
Date: Fri Dec 12 11:13:09 2014 +0100
Get rid of warning comparision will always evaluate as true
diff --git a/ChangeLog b/ChangeLog
index 53995f9..9f18f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-12 Stefan Liebler <stli@linux.vnet.ibm.com>
+
+ * nptl/tst-mutex6.c
+ (ATTR_NULL): New define checks ATTR against NULL.
+ (do_test): Use !ATTR_NULL instead of ATTR != NULL.
+ * nptl/tst-mutexpp6.c (ATTR_NULL): New define.
+
2014-12-11 James Lemke <jwlemke@codesourcery.com>
[BZ #17581]
@@ -117,7 +124,7 @@
2014-12-11 Stefan Liebler <stli@linux.vnet.ibm.com>
- sysdeps/s390/s390-32/dl-machine.h (elf_machine_load_address):
+ * sysdeps/s390/s390-32/dl-machine.h (elf_machine_load_address):
Truncating assembler expression to a .long expression.
2014-12-11 Andreas Schwab <schwab@suse.de>
diff --git a/nptl/tst-mutex6.c b/nptl/tst-mutex6.c
index 292e3bf..9c11a20 100644
--- a/nptl/tst-mutex6.c
+++ b/nptl/tst-mutex6.c
@@ -21,6 +21,7 @@
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
+#include <stdbool.h>
#ifndef ATTR
@@ -28,6 +29,9 @@ pthread_mutexattr_t *attr;
# define ATTR attr
#endif
+#ifndef ATTR_NULL
+# define ATTR_NULL (ATTR == NULL)
+#endif
static int
do_test (void)
@@ -35,7 +39,7 @@ do_test (void)
pthread_mutex_t m;
int e = pthread_mutex_init (&m, ATTR);
- if (ATTR != NULL && e == ENOTSUP)
+ if (!ATTR_NULL && e == ENOTSUP)
{
puts ("cannot support selected type of mutexes");
e = pthread_mutex_init (&m, NULL);
@@ -46,7 +50,7 @@ do_test (void)
return 1;
}
- if (ATTR != NULL && pthread_mutexattr_destroy (ATTR) != 0)
+ if (!ATTR_NULL && pthread_mutexattr_destroy (ATTR) != 0)
{
puts ("mutexattr_destroy failed");
return 1;
diff --git a/nptl/tst-mutexpp6.c b/nptl/tst-mutexpp6.c
index 2ddf6b4..87a6ebd 100644
--- a/nptl/tst-mutexpp6.c
+++ b/nptl/tst-mutexpp6.c
@@ -42,4 +42,5 @@ do_test_wrapper (void)
#define TEST_FUNCTION do_test_wrapper ()
#define ATTR &a
+#define ATTR_NULL false
#include "tst-mutex6.c"
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 ++++++++-
nptl/tst-mutex6.c | 8 ++++++--
nptl/tst-mutexpp6.c | 1 +
3 files changed, 15 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources