diff options
Diffstat (limited to 'src/machine')
-rw-r--r-- | src/machine/machine-dbus.c | 4 | ||||
-rw-r--r-- | src/machine/machine.h | 3 | ||||
-rw-r--r-- | src/machine/machined.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 2c7f3a798e..c6a794b5e8 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -142,7 +142,7 @@ const sd_bus_vtable machine_vtable[] = { SD_BUS_VTABLE_END }; -int machine_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata) { +int machine_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) { Manager *m = userdata; Machine *machine; int r; @@ -201,7 +201,7 @@ char *machine_bus_path(Machine *m) { return strappend("/org/freedesktop/machine1/machine/", e); } -int machine_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata) { +int machine_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) { _cleanup_strv_free_ char **l = NULL; Machine *machine = NULL; Manager *m = userdata; diff --git a/src/machine/machine.h b/src/machine/machine.h index 99ee25888e..62e4b2b340 100644 --- a/src/machine/machine.h +++ b/src/machine/machine.h @@ -93,7 +93,8 @@ MachineState machine_get_state(Machine *u); extern const sd_bus_vtable machine_vtable[]; char *machine_bus_path(Machine *s); -int machine_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata); +int machine_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error); +int machine_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error); int machine_send_signal(Machine *m, bool new_machine); int machine_send_create_reply(Machine *m, sd_bus_error *error); diff --git a/src/machine/machined.h b/src/machine/machined.h index 0b074c4e8a..d4b581be7a 100644 --- a/src/machine/machined.h +++ b/src/machine/machined.h @@ -60,8 +60,6 @@ int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine); extern const sd_bus_vtable manager_vtable[]; -int machine_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata); - int match_reloading(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); int match_unit_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); int match_properties_changed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); |