This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: Disable -Waddress for part of nptl/tst-mutex1.c
- From: Joseph Myers <joseph at codesourcery dot com>
- To: Roland McGrath <roland at hack dot frob dot com>
- Cc: <libc-alpha at sourceware dot org>
- Date: Tue, 2 Dec 2014 22:24:48 +0000
- Subject: Re: Disable -Waddress for part of nptl/tst-mutex1.c
- Authentication-results: sourceware.org; auth=none
- References: <alpine dot DEB dot 2 dot 10 dot 1411261731080 dot 854 at digraph dot polyomino dot org dot uk> <20141202192637 dot 5D2172C39FE at topped-with-meat dot com>
On Tue, 2 Dec 2014, Roland McGrath wrote:
> The ATTR_NULL approach seems far cleaner to me. Why disable warnings when
> a code cleanup suffices?
Here is a patch using ATTR_NULL. Tested for x86_64.
2014-12-02 Joseph Myers <joseph@codesourcery.com>
* nptl/tst-mutex1.c: Include <stdbool.h>.
[!ATTR] (ATTR_NULL): New macro.
(do_test): Test !ATTR_NULL instead of ATTR != NULL.
* nptl/tst-mutexpi1.c (ATTR_NULL): New macro.
* nptl/tst-mutexpp1.c (ATTR_NULL): New macro.
diff --git a/nptl/tst-mutex1.c b/nptl/tst-mutex1.c
index 2a181e5..27ce54f 100644
--- a/nptl/tst-mutex1.c
+++ b/nptl/tst-mutex1.c
@@ -19,10 +19,12 @@
#include <pthread.h>
#include <stdio.h>
#include <errno.h>
+#include <stdbool.h>
#ifndef ATTR
# define ATTR NULL
+# define ATTR_NULL true
#endif
@@ -32,7 +34,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");
return 0;
@@ -43,7 +45,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-mutexpi1.c b/nptl/tst-mutexpi1.c
index 623ede9..d768664 100644
--- a/nptl/tst-mutexpi1.c
+++ b/nptl/tst-mutexpi1.c
@@ -24,4 +24,5 @@ prepare (void)
#define ATTR &a
+#define ATTR_NULL false
#include "tst-mutex1.c"
diff --git a/nptl/tst-mutexpp1.c b/nptl/tst-mutexpp1.c
index 9b7d7fe..8ec4673 100644
--- a/nptl/tst-mutexpp1.c
+++ b/nptl/tst-mutexpp1.c
@@ -42,4 +42,5 @@ do_test_wrapper (void)
#define TEST_FUNCTION do_test_wrapper ()
#define ATTR &a
+#define ATTR_NULL false
#include "tst-mutex1.c"
--
Joseph S. Myers
joseph@codesourcery.com