From: Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>
Date: Sat, 28 Mar 2009 23:39:29 +0000 (+0100)
Subject: Fix DBusMessage compiler warnings by adding some missing casts.
X-Git-Tag: dbus-1.3.1~227
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d0c9d37de01c97df806e9635ee55746e8dfe0e9;p=thirdparty%2Fdbus.git

Fix DBusMessage compiler warnings by adding some missing casts.

Basically the case where the address of a const pointer is passed as a non-const void pointer.
(cherry picked from commit dab3ec2abe7fbeea4dab873c8575a45b3b18882d)
---

diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index e5c0a1e3f..d05355906 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -825,7 +825,7 @@ _dbus_message_iter_get_args_valist (DBusMessageIter *iter,
               _dbus_type_reader_recurse (&real->u.reader, &array);
 
               _dbus_type_reader_read_fixed_multi (&array,
-                                                  ptr, n_elements_p);
+                                                  (void *) ptr, n_elements_p);
             }
           else if (spec_element_type == DBUS_TYPE_STRING ||
                    spec_element_type == DBUS_TYPE_SIGNATURE ||
@@ -866,7 +866,7 @@ _dbus_message_iter_get_args_valist (DBusMessageIter *iter,
                 {
                   const char *s;
                   _dbus_type_reader_read_basic (&array,
-                                                &s);
+                                                (void *) &s);
                   
                   str_array[i] = _dbus_strdup (s);
                   if (str_array[i] == NULL)
@@ -2907,7 +2907,7 @@ dbus_message_get_path (DBusMessage   *message)
   _dbus_header_get_field_basic (&message->header,
                                 DBUS_HEADER_FIELD_PATH,
                                 DBUS_TYPE_OBJECT_PATH,
-                                &v);
+                                (void *) &v);
   return v;
 }
 
@@ -3038,7 +3038,7 @@ dbus_message_get_interface (DBusMessage *message)
   _dbus_header_get_field_basic (&message->header,
                                 DBUS_HEADER_FIELD_INTERFACE,
                                 DBUS_TYPE_STRING,
-                                &v);
+                                (void *) &v);
   return v;
 }
 
@@ -3124,7 +3124,7 @@ dbus_message_get_member (DBusMessage *message)
   _dbus_header_get_field_basic (&message->header,
                                 DBUS_HEADER_FIELD_MEMBER,
                                 DBUS_TYPE_STRING,
-                                &v);
+                                (void *) &v);
   return v;
 }
 
@@ -3208,7 +3208,7 @@ dbus_message_get_error_name (DBusMessage *message)
   _dbus_header_get_field_basic (&message->header,
                                 DBUS_HEADER_FIELD_ERROR_NAME,
                                 DBUS_TYPE_STRING,
-                                &v);
+                                (void *) &v);
   return v;
 }
 
@@ -3261,7 +3261,7 @@ dbus_message_get_destination (DBusMessage *message)
   _dbus_header_get_field_basic (&message->header,
                                 DBUS_HEADER_FIELD_DESTINATION,
                                 DBUS_TYPE_STRING,
-                                &v);
+                                (void *) &v);
   return v;
 }
 
@@ -3321,7 +3321,7 @@ dbus_message_get_sender (DBusMessage *message)
   _dbus_header_get_field_basic (&message->header,
                                 DBUS_HEADER_FIELD_SENDER,
                                 DBUS_TYPE_STRING,
-                                &v);
+                                (void *) &v);
   return v;
 }