SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bus: also add error parameter to object find and enumerator callbacks

Browse Source 
Just in order to bring things inline with the method and property
callbacks.
This commit is contained in:
Lennart Poettering
2013-11-22 01:42:15 +01:00
parent 969987ea93
commit f00c31213a
14 changed files with 145 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/machine/machine-dbus.c
+2 -2
View File
@@ -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;
src/machine/machine.h
+2 -1
View File
@@ -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);
src/machine/machined.h
-2
View File
@@ -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);