chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0442c13
)
dbus: implement GetAll() with empty interface string properly
author
Lennart Poettering
<lennart@poettering.net>
Sun, 4 Jul 2010 01:43:20 +0000
(
03:43
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Sun, 4 Jul 2010 01:43:20 +0000
(
03:43
+0200)
src/dbus.c
patch
|
blob
|
history
diff --git
a/src/dbus.c
b/src/dbus.c
index 2c2a9cd6c292f69711e38949e3ad83b9d5b65af6..3a6d79f3d9368f8cf15739f5e50eb31a90afaefd 100644
(file)
--- a/
src/dbus.c
+++ b/
src/dbus.c
@@
-1201,7
+1201,6
@@
DBusHandlerResult bus_default_message_handler(Manager *m, DBusConnection *c, DBu
const char *interface;
const BusProperty *p;
DBusMessageIter iter, sub, sub2, sub3;
const char *interface;
const BusProperty *p;
DBusMessageIter iter, sub, sub2, sub3;
- bool any = false;
if (!dbus_message_get_args(
message,
if (!dbus_message_get_args(
message,
@@
-1219,7
+1218,7
@@
DBusHandlerResult bus_default_message_handler(Manager *m, DBusConnection *c, DBu
goto oom;
for (p = properties; p->property; p++) {
goto oom;
for (p = properties; p->property; p++) {
- if (!streq(p->interface, interface))
+ if (
interface[0] &&
!streq(p->interface, interface))
continue;
if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, NULL, &sub2) ||
continue;
if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, NULL, &sub2) ||
@@
-1239,8
+1238,6
@@
DBusHandlerResult bus_default_message_handler(Manager *m, DBusConnection *c, DBu
if (!dbus_message_iter_close_container(&sub2, &sub3) ||
!dbus_message_iter_close_container(&sub, &sub2))
goto oom;
if (!dbus_message_iter_close_container(&sub2, &sub3) ||
!dbus_message_iter_close_container(&sub, &sub2))
goto oom;
-
- any = true;
}
if (!dbus_message_iter_close_container(&iter, &sub))
}
if (!dbus_message_iter_close_container(&iter, &sub))