[Mingw-w64-public] [PATCH 17/18] winpthreads: Don't assign within a conditional expression

[Antonin Décimo]

This idiom raises an annoying MSVC warning, C4706.

https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-4-c4706?view=msvc-170

Signed-off-by: Antonin Décimo <anto...@tarides.com>
---
 mingw-w64-libraries/winpthreads/src/barrier.c | 6 +++---
 mingw-w64-libraries/winpthreads/src/cond.c    | 6 +++---
 mingw-w64-libraries/winpthreads/src/sem.c     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mingw-w64-libraries/winpthreads/src/barrier.c 
b/mingw-w64-libraries/winpthreads/src/barrier.c
index 95b2252af..e973aaaa7 100644
--- a/mingw-w64-libraries/winpthreads/src/barrier.c
+++ b/mingw-w64-libraries/winpthreads/src/barrier.c
@@ -139,7 +139,7 @@ pthread_barrier_init (pthread_barrier_t *b_, const void 
*attr,
     if (!count || !b_)
       return EINVAL;
 
-    if (!(b = (pthread_barrier_t)calloc(1,sizeof(*b))))
+    if ((b = (pthread_barrier_t)calloc(1,sizeof(*b))) == NULL)
        return ENOMEM;
     if (!attr || *((int **)attr) == NULL)
       b->share = PTHREAD_PROCESS_PRIVATE;
@@ -185,7 +185,7 @@ int pthread_barrier_wait(pthread_barrier_t *b_)
 
   b = (barrier_t *)*b_;
 
-  if ((r = pthread_mutex_lock(&b->m))) return  barrier_unref(b_,EINVAL);
+  if ((r = pthread_mutex_lock(&b->m)) != 0) return  barrier_unref(b_,EINVAL);
   sel = b->sel;
   InterlockedDecrement((long*)&b->total);
   if (b->total == 0)
@@ -209,7 +209,7 @@ int pthread_barrierattr_init(void **attr)
 {
   int *p;
 
-  if (!(p = (int *) calloc (1, sizeof (int))))
+  if ((p = (int *) calloc (1, sizeof (int))) == NULL)
     return ENOMEM;
 
   *p = PTHREAD_PROCESS_PRIVATE;
diff --git a/mingw-w64-libraries/winpthreads/src/cond.c 
b/mingw-w64-libraries/winpthreads/src/cond.c
index 7a3b73a5a..813648f0e 100644
--- a/mingw-w64-libraries/winpthreads/src/cond.c
+++ b/mingw-w64-libraries/winpthreads/src/cond.c
@@ -202,9 +202,9 @@ pthread_cond_init (pthread_cond_t *c, const 
pthread_condattr_t *a)
   if (a && *a == PTHREAD_PROCESS_SHARED)
     return ENOSYS;
 
-  if ( !(_c = calloc(1,sizeof(*_c))) ) {
-      return ENOMEM; 
-  }
+  if ((_c = calloc(1, sizeof(*_c))) == NULL)
+    return ENOMEM;
+
   _c->valid  = DEAD_COND;
   _c->busy = 0;
   _c->waiters_count_ = 0;
diff --git a/mingw-w64-libraries/winpthreads/src/sem.c 
b/mingw-w64-libraries/winpthreads/src/sem.c
index d79c88f2e..340ff69e0 100644
--- a/mingw-w64-libraries/winpthreads/src/sem.c
+++ b/mingw-w64-libraries/winpthreads/src/sem.c
@@ -52,7 +52,7 @@ sem_init (sem_t *sem, int pshared, unsigned int value)
   if (pshared != PTHREAD_PROCESS_PRIVATE)
     return sem_result (EPERM);
 
-  if (!(sv = (sem_t) calloc (1,sizeof (*sv))))
+  if ((sv = (sem_t) calloc (1,sizeof (*sv))) == NULL)
     return sem_result (ENOMEM);
 
   sv->value = value;
-- 
2.43.0



_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public