chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
macro: hookup assert logic with log logic
[elogind.git]
/
dbus.c
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;