chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: fix --help syntax for variables
[elogind.git]
/
src
/
dbus-swap.c
diff --git
a/src/dbus-swap.c
b/src/dbus-swap.c
index 70cccdcab8f41e379b0c3ee627383613f9227a2d..988ca58d4b3aad2bd0dbe13060403fda879bac6a 100644
(file)
--- a/
src/dbus-swap.c
+++ b/
src/dbus-swap.c
@@
-25,6
+25,7
@@
#include "dbus-unit.h"
#include "dbus-swap.h"
#include "dbus-execute.h"
#include "dbus-unit.h"
#include "dbus-swap.h"
#include "dbus-execute.h"
+#include "dbus-common.h"
#define BUS_SWAP_INTERFACE \
" <interface name=\"org.freedesktop.systemd1.Swap\">\n" \
#define BUS_SWAP_INTERFACE \
" <interface name=\"org.freedesktop.systemd1.Swap\">\n" \
@@
-47,21
+48,23
@@
BUS_INTROSPECTABLE_INTERFACE \
"</node>\n"
BUS_INTROSPECTABLE_INTERFACE \
"</node>\n"
-const char bus_swap_interface[] = BUS_SWAP_INTERFACE;
+#define INTERFACES_LIST \
+ BUS_UNIT_INTERFACES_LIST \
+ "org.freedesktop.systemd1.Swap\0"
+
+const char bus_swap_interface[] _introspect_("Swap") = BUS_SWAP_INTERFACE;
const char bus_swap_invalidating_properties[] =
"What\0"
"Priority\0"
"ExecActivate\0"
"ExecDeactivate\0"
const char bus_swap_invalidating_properties[] =
"What\0"
"Priority\0"
"ExecActivate\0"
"ExecDeactivate\0"
- "ControlPID\0"
- "\0";
+ "ControlPID\0";
-static int bus_swap_append_priority(
Manager *m,
DBusMessageIter *i, const char *property, void *data) {
+static int bus_swap_append_priority(DBusMessageIter *i, const char *property, void *data) {
Swap *s = data;
dbus_int32_t j;
Swap *s = data;
dbus_int32_t j;
- assert(m);
assert(i);
assert(property);
assert(s);
assert(i);
assert(property);
assert(s);
@@
-93,5
+96,5
@@
DBusHandlerResult bus_swap_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
, properties);
+ return bus_default_message_handler(
c, message, INTROSPECTION, INTERFACES_LIST
, properties);
}
}