X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus-path.c;h=15238798ae5d7dffbc44b2f54fa594e1c459db63;hp=1e757a30603e37559795f0dbf2680a77cbd220c6;hb=cfc27668b0fec2c56db0fb118804ede773bef876;hpb=0e456f978134100d2e0cc28c7205b3abefcc9cde diff --git a/src/dbus-path.c b/src/dbus-path.c index 1e757a306..15238798a 100644 --- a/src/dbus-path.c +++ b/src/dbus-path.c @@ -24,6 +24,7 @@ #include "dbus-unit.h" #include "dbus-path.h" #include "dbus-execute.h" +#include "dbus-common.h" #define BUS_PATH_INTERFACE \ " \n" \ @@ -49,12 +50,11 @@ const char bus_path_interface[] _introspect_("Path") = BUS_PATH_INTERFACE; -static int bus_path_append_paths(Manager *m, DBusMessageIter *i, const char *property, void *data) { +static int bus_path_append_paths(DBusMessageIter *i, const char *property, void *data) { Path *p = data; DBusMessageIter sub, sub2; PathSpec *k; - assert(m); assert(i); assert(property); assert(p); @@ -78,11 +78,10 @@ static int bus_path_append_paths(Manager *m, DBusMessageIter *i, const char *pro return 0; } -static int bus_path_append_unit(Manager *m, DBusMessageIter *i, const char *property, void *data) { +static int bus_path_append_unit(DBusMessageIter *i, const char *property, void *data) { Unit *u = data; const char *t; - assert(m); assert(i); assert(property); assert(u); @@ -102,5 +101,5 @@ DBusHandlerResult bus_path_message_handler(Unit *u, DBusConnection *c, DBusMessa { NULL, NULL, NULL, NULL, NULL } }; - return bus_default_message_handler(u->meta.manager, c, message, INTROSPECTION, INTERFACES_LIST, properties); + return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties); }