Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Get rid of warning comparision will always evaluate as true
  • Loading branch information
Stefan Liebler authored and Andreas Krebbel committed Dec 12, 2014
1 parent 9173840 commit 9d9c001
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
9 changes: 8 additions & 1 deletion 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]
Expand Down Expand Up @@ -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>
Expand Down
8 changes: 6 additions & 2 deletions nptl/tst-mutex6.c
Expand Up @@ -21,21 +21,25 @@
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
#include <stdbool.h>


#ifndef ATTR
pthread_mutexattr_t *attr;
# define ATTR attr
#endif

#ifndef ATTR_NULL
# define ATTR_NULL (ATTR == NULL)
#endif

static int
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);
Expand All @@ -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;
Expand Down
1 change: 1 addition & 0 deletions nptl/tst-mutexpp6.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-mutex6.c"

0 comments on commit 9d9c001

Please sign in to comment.