From: Alex Richardson <arichardson.kde@gmail.com>
Date: Sun, 15 May 2022 10:24:15 +0000 (+0100)
Subject: dbus-memory.c: Silence -Wcast-align warnings
X-Git-Tag: dbus-1.15.0~57^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6689b4f022c789367b9988835ccaacfa4826c1b;p=thirdparty%2Fdbus.git

dbus-memory.c: Silence -Wcast-align warnings

These values will be appropriately aligned, so we can silence the warning
by adding a void* cast.
---

diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c
index cee74462f..ce177bea7 100644
--- a/dbus/dbus-memory.c
+++ b/dbus/dbus-memory.c
@@ -337,8 +337,8 @@ check_guards (void       *free_block,
   if (free_block != NULL)
     {
       unsigned char *block = ((unsigned char*)free_block) - GUARD_START_OFFSET;
-      size_t requested_bytes = *(dbus_uint32_t*)block;
-      BlockSource source = *(dbus_uint32_t*)(block + 4);
+      size_t requested_bytes = *(dbus_uint32_t *) (void *) block;
+      BlockSource source = *(dbus_uint32_t *) (void *) (block + 4);
       unsigned int i;
       dbus_bool_t failed;
 
@@ -352,7 +352,7 @@ check_guards (void       *free_block,
       i = GUARD_INFO_SIZE;
       while (i < GUARD_START_OFFSET)
         {
-          dbus_uint32_t value = *(dbus_uint32_t*) &block[i];
+          dbus_uint32_t value = *(dbus_uint32_t *) (void *) &block[i];
           if (value != GUARD_VALUE)
             {
               _dbus_warn ("Block of %lu bytes from %s had start guard value 0x%ux at %d expected 0x%x",
@@ -367,7 +367,7 @@ check_guards (void       *free_block,
       i = GUARD_START_OFFSET + requested_bytes;
       while (i < (GUARD_START_OFFSET + requested_bytes + GUARD_END_PAD))
         {
-          dbus_uint32_t value = *(dbus_uint32_t*) &block[i];
+          dbus_uint32_t value = *(dbus_uint32_t *) (void *) &block[i];
           if (value != GUARD_VALUE)
             {
               _dbus_warn ("Block of %lu bytes from %s had end guard value 0x%ux at %d expected 0x%x",
@@ -400,23 +400,23 @@ set_guards (void       *real_block,
     return NULL;
 
   _dbus_assert (GUARD_START_OFFSET + GUARD_END_PAD == GUARD_EXTRA_SIZE);
-  
-  *((dbus_uint32_t*)block) = requested_bytes;
-  *((dbus_uint32_t*)(block + 4)) = source;
+
+  *((dbus_uint32_t *) (void *) block) = requested_bytes;
+  *((dbus_uint32_t *) (void *) (block + 4)) = source;
 
   i = GUARD_INFO_SIZE;
   while (i < GUARD_START_OFFSET)
     {
-      (*(dbus_uint32_t*) &block[i]) = GUARD_VALUE;
-      
+      (*(dbus_uint32_t *) (void *) &block[i]) = GUARD_VALUE;
+
       i += 4;
     }
 
   i = GUARD_START_OFFSET + requested_bytes;
   while (i < (GUARD_START_OFFSET + requested_bytes + GUARD_END_PAD))
     {
-      (*(dbus_uint32_t*) &block[i]) = GUARD_VALUE;
-      
+      (*(dbus_uint32_t *) (void *) &block[i]) = GUARD_VALUE;
+
       i += 4;
     }