diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-04-16 01:54:49 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-04-16 02:03:35 +0200 |
| commit | bfebab7f69cb23f3a488f02bc2be9c8309808221 (patch) | |
| tree | 15706e6e3730e3a5b167fa4642d255b9b3956797 /src/dbus-path.c | |
| parent | e1830b12ae8d97a1baaabe28d9ee28c77835463d (diff) | |
dbus: split out object management code into dbus-common, and simplify it
Diffstat (limited to 'src/dbus-path.c')
| -rw-r--r-- | src/dbus-path.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/dbus-path.c b/src/dbus-path.c index 1e757a3060..15238798ae 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 \ " <interface name=\"org.freedesktop.systemd1.Path\">\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); } |