dbus: make data pointer for properties read-only

diff --git a/dbus.c b/dbus.c
index 96527ac8cfd1576e83e7708fb1db56d18225fc68..e2f8f3cd496b15598e5367786e90ddfe4dd8cda0 100644 (file)
--- a/dbus.c
+++ b/dbus.c
@@ -697,7 +697,7 @@ DBusHandlerResult bus_default_message_handler(Manager *m, DBusMessage *message,
                         if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, p->signature, &sub))
                                 goto oom;
 
                         if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, p->signature, &sub))
                                 goto oom;
 

-                        if ((r = p->append(m, &sub, property, p->data)) < 0) {
+                        if ((r = p->append(m, &sub, property, (void*) p->data)) < 0) {

 
                                 if (r == -ENOMEM)
                                         goto oom;
 
                                 if (r == -ENOMEM)
                                         goto oom;


@@ -739,7 +739,7 @@ DBusHandlerResult bus_default_message_handler(Manager *m, DBusMessage *message,
                             !dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, p->signature, &sub3))
                                 goto oom;
 
                             !dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, p->signature, &sub3))
                                 goto oom;
 

-                        if ((r = p->append(m, &sub3, p->property, p->data)) < 0) {
+                        if ((r = p->append(m, &sub3, p->property, (void*) p->data)) < 0) {

 
                                 if (r == -ENOMEM)
                                         goto oom;
 
                                 if (r == -ENOMEM)
                                         goto oom;

diff --git a/dbus.h b/dbus.h
index 06b7e20602a2c72c9b218abc7ad0bf89614915c0..5b41877e8c3a9a1c9ac6a62c775fee8c8efcd598 100644 (file)
--- a/dbus.h
+++ b/dbus.h
@@ -33,7 +33,7 @@ typedef struct BusProperty {
         const char *property;            /* name of the property */
         BusPropertyCallback append;      /* Function that is called to serialize this property */
         const char *signature;
         const char *property;            /* name of the property */
         BusPropertyCallback append;      /* Function that is called to serialize this property */
         const char *signature;

-        void *data;                      /* The data of this property */
+        const void *data;                /* The data of this property */

 } BusProperty;
 
 #define BUS_PROPERTIES_INTERFACE                                        \
 } BusProperty;
 
 #define BUS_PROPERTIES_INTERFACE                                        \