X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus-mount.c;h=cfbfd4531cdb3d8ddd6885658a008c95d1909c60;hp=fa319febd59cc761506ce8db7505f3337a1f50c5;hb=d98b9b63456dd2e99261ae1ddd4cb635c5e11b69;hpb=9a60da2834074d970ca063c210fe9d2f05c70532

diff --git a/src/dbus-mount.c b/src/dbus-mount.c
index fa319febd..cfbfd4531 100644
--- a/src/dbus-mount.c
+++ b/src/dbus-mount.c
@@ -24,6 +24,7 @@
 #include "dbus-unit.h"
 #include "dbus-mount.h"
 #include "dbus-execute.h"
+#include "dbus-common.h"
 
 #define BUS_MOUNT_INTERFACE                                             \
         " <interface name=\"org.freedesktop.systemd1.Mount\">\n"        \
@@ -50,6 +51,10 @@
         BUS_INTROSPECTABLE_INTERFACE                                    \
         "</node>\n"
 
+#define INTERFACES_LIST                              \
+        BUS_UNIT_INTERFACES_LIST                     \
+        "org.freedesktop.systemd1.Mount\0"
+
 const char bus_mount_interface[] _introspect_("Mount") = BUS_MOUNT_INTERFACE;
 
 const char bus_mount_invalidating_properties[] =
@@ -59,14 +64,12 @@ const char bus_mount_invalidating_properties[] =
         "ExecMount\0"
         "ExecUnmount\0"
         "ExecRemount\0"
-        "ControlPID\0"
-        "\0";
+        "ControlPID\0";
 
-static int bus_mount_append_what(Manager *n, DBusMessageIter *i, const char *property, void *data) {
+static int bus_mount_append_what(DBusMessageIter *i, const char *property, void *data) {
         Mount *m = data;
         const char *d;
 
-        assert(n);
         assert(i);
         assert(property);
         assert(m);
@@ -86,11 +89,10 @@ static int bus_mount_append_what(Manager *n, DBusMessageIter *i, const char *pro
         return 0;
 }
 
-static int bus_mount_append_options(Manager *n, DBusMessageIter *i, const char *property, void *data) {
+static int bus_mount_append_options(DBusMessageIter *i, const char *property, void *data) {
         Mount *m = data;
         const char *d;
 
-        assert(n);
         assert(i);
         assert(property);
         assert(m);
@@ -110,11 +112,10 @@ static int bus_mount_append_options(Manager *n, DBusMessageIter *i, const char *
         return 0;
 }
 
-static int bus_mount_append_type(Manager *n, DBusMessageIter *i, const char *property, void *data) {
+static int bus_mount_append_type(DBusMessageIter *i, const char *property, void *data) {
         Mount *m = data;
         const char *d;
 
-        assert(n);
         assert(i);
         assert(property);
         assert(m);
@@ -135,6 +136,7 @@ static int bus_mount_append_type(Manager *n, DBusMessageIter *i, const char *pro
 }
 
 DBusHandlerResult bus_mount_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
+
         const BusProperty properties[] = {
                 BUS_UNIT_PROPERTIES,
                 { "org.freedesktop.systemd1.Mount", "Where",         bus_property_append_string, "s", u->mount.where           },
@@ -151,5 +153,5 @@ DBusHandlerResult bus_mount_message_handler(Unit *u, DBusConnection *c, DBusMess
                 { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(u->meta.manager, c, message, INTROSPECTION, properties);
+        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties);
 }