summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-04-10 17:39:36 +0200
committerLennart Poettering <lennart@poettering.net>2010-04-10 18:00:28 +0200
commitb9f49ee478fdc06c45092f208f1dddd23680ab13 (patch)
treed005cfef2163b972d037ca68583940393320d0f1
parent6f4706b79e37754c83677e81396e783dde243b39 (diff)
dbus: make data pointer for properties read-only
-rw-r--r--dbus.c4
-rw-r--r--dbus.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/dbus.c b/dbus.c
index 96527ac8cf..e2f8f3cd49 100644
--- 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 ((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;
@@ -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;
- 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;
diff --git a/dbus.h b/dbus.h
index 06b7e20602..5b41877e8c 100644
--- 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;
- void *data; /* The data of this property */
+ const void *data; /* The data of this property */
} BusProperty;
#define BUS_PROPERTIES_INTERFACE \