From: Ivan Maidanski <ivmai@mail.ru>
Date: Thu, 3 May 2018 08:16:32 +0000 (+0300)
Subject: Workaround 'opposite expression on both sides of &' cppcheck style warning
X-Git-Tag: v7.6.8~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6130cdff23ce4f0ba0b278046a2a2a7beb5cb74;p=gc

Workaround 'opposite expression on both sides of &' cppcheck style warning

* mallocx.c (GC_posix_memalign): Replace (align-1)&align with
align_minus_one&align where align_minus_one local variable is set to
align-1.
---

diff --git a/mallocx.c b/mallocx.c
index f7a680a1..d6b7f965 100644
--- a/mallocx.c
+++ b/mallocx.c
@@ -493,7 +493,8 @@ GC_API GC_ATTR_MALLOC void * GC_CALL GC_memalign(size_t align, size_t lb)
 GC_API int GC_CALL GC_posix_memalign(void **memptr, size_t align, size_t lb)
 {
   /* Check alignment properly.  */
-  if (((align - 1) & align) != 0 || align < sizeof(void *)) {
+  size_t align_minus_one = align - 1; /* to workaround a cppcheck warning */
+  if (align < sizeof(void *) || (align_minus_one & align) != 0) {
 #   ifdef MSWINCE
       return ERROR_INVALID_PARAMETER;
 #   else