From: Ivan Maidanski <ivmai@mail.ru>
Date: Tue, 19 Sep 2017 06:58:11 +0000 (+0300)
Subject: Eliminate 'boolean result used in bitwise op' cppcheck false warning
X-Git-Tag: v7.6.2~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bd755892dacc877823ec53e124f149407d08c28;p=gc

Eliminate 'boolean result used in bitwise op' cppcheck false warning

* extra/AmigaOS.c [GC_AMIGA_DS] (GC_register_data_segments):
Replace (ULONG)&data[1] in comparison to (ULONG)(&data[1]).
* misc.c [!THREADS && !SPARC] (GC_do_blocking_inner):
Replace (ptr_t)&d in comparison to (ptr_t)(&d).
---

diff --git a/extra/AmigaOS.c b/extra/AmigaOS.c
index 549e20fb..d8311eed 100644
--- a/extra/AmigaOS.c
+++ b/extra/AmigaOS.c
@@ -106,8 +106,9 @@ ptr_t GC_get_main_stack_base(void)
 
         for (data = (ULONG *)BADDR(myseglist); data != NULL;
              data = (ULONG *)BADDR(data[0])) {
-          if (((ULONG) GC_register_data_segments < (ULONG) &data[1]) ||
-              ((ULONG) GC_register_data_segments > (ULONG) &data[1] + data[-1])) {
+          if ((ULONG)GC_register_data_segments < (ULONG)(&data[1])
+              || (ULONG)GC_register_data_segments > (ULONG)(&data[1])
+                                                    + data[-1]) {
 #             ifdef __GNUC__
                 if (dataSegSize == data[-1]) {
                   found_segment = TRUE;
diff --git a/misc.c b/misc.c
index 4ada4777..312d2c55 100644
--- a/misc.c
+++ b/misc.c
@@ -2025,7 +2025,7 @@ STATIC void GC_do_blocking_inner(ptr_t data, void * context GC_ATTR_UNUSED)
 #   ifdef SPARC
         GC_ASSERT(GC_blocked_sp != NULL);
 #   else
-        GC_ASSERT(GC_blocked_sp == (ptr_t) &d);
+        GC_ASSERT(GC_blocked_sp == (ptr_t)(&d));
 #   endif
 #   if defined(CPPCHECK)
       GC_noop1((word)GC_blocked_sp);