chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pam: fix build
[elogind.git]
/
src
/
dbus-path.c
diff --git
a/src/dbus-path.c
b/src/dbus-path.c
index 1e757a30603e37559795f0dbf2680a77cbd220c6..f67b5a2b7c3b7e3f95b4a50242035f9831272975 100644
(file)
--- 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-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" \
#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;
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;
Path *p = data;
DBusMessageIter sub, sub2;
PathSpec *k;
- assert(m);
assert(i);
assert(property);
assert(p);
assert(i);
assert(property);
assert(p);
@@
-78,16
+78,15
@@
static int bus_path_append_paths(Manager *m, DBusMessageIter *i, const char *pro
return 0;
}
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;
Unit *u = data;
const char *t;
- assert(m);
assert(i);
assert(property);
assert(u);
assert(i);
assert(property);
assert(u);
- t =
u->path.unit ? u->path.unit
->meta.id : "";
+ t =
UNIT_DEREF(u->path.unit) ? UNIT_DEREF(u->path.unit)
->meta.id : "";
return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM;
}
return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM;
}
@@
-102,5
+101,5
@@
DBusHandlerResult bus_path_message_handler(Unit *u, DBusConnection *c, DBusMessa
{ NULL, NULL, NULL, NULL, NULL }
};
{ 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);
}
}