Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix -Waddress warnings in nptl/tst-mutex1.c.
This patch fixes -Waddress warnings in nptl/tst-mutex1.c from
comparing the address of an object with NULL (ATTR may either be NULL,
or the address of an object when included from other tests, and the
warning arises in the latter case).  A macro ATTR_NULL is defined
alongside ATTR and used for the tests.

Tested for x86_64.

	* 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.
  • Loading branch information
Joseph Myers committed Dec 2, 2014
1 parent b1aff6a commit 4e0b901
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
@@ -1,5 +1,11 @@
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.

* posix/tst-getopt_long1.c (do_test): Cast elements of argv array
to char *.

Expand Down
6 changes: 4 additions & 2 deletions nptl/tst-mutex1.c
Expand Up @@ -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


Expand All @@ -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;
Expand All @@ -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;
Expand Down
1 change: 1 addition & 0 deletions nptl/tst-mutexpi1.c
Expand Up @@ -24,4 +24,5 @@ prepare (void)


#define ATTR &a
#define ATTR_NULL false
#include "tst-mutex1.c"
1 change: 1 addition & 0 deletions nptl/tst-mutexpp1.c
Expand Up @@ -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"

0 comments on commit 4e0b901

Please sign in to comment.