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

Just in order to bring things inline with the method and property
callbacks.

6 files changed, 12 insertions, 12 deletions

diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index 488d007c7..f274c0d63 100644
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -254,7 +254,7 @@ const sd_bus_vtable seat_vtable[] = {
         SD_BUS_VTABLE_END
 };
 
-int seat_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata) {
+int seat_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
         Manager *m = userdata;
         Seat *seat;
         int r;
@@ -319,7 +319,7 @@ char *seat_bus_path(Seat *s) {
         return strappend("/org/freedesktop/login1/seat/", t);
 }
 
-int seat_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata) {
+int seat_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {
         _cleanup_strv_free_ char **l = NULL;
         Manager *m = userdata;
         Seat *seat;
diff --git a/src/login/logind-seat.h b/src/login/logind-seat.h
index 0547dec07..80c6b8bd9 100644
--- a/src/login/logind-seat.h
+++ b/src/login/logind-seat.h
@@ -82,8 +82,8 @@ bool seat_name_is_valid(const char *name);
 
 extern const sd_bus_vtable seat_vtable[];
 
-int seat_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata);
-int seat_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *seatdata);
+int seat_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error);
+int seat_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
 char *seat_bus_path(Seat *s);
 
 int seat_send_signal(Seat *s, bool new_seat);
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index d2e2364fc..9f3217baf 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -465,7 +465,7 @@ const sd_bus_vtable session_vtable[] = {
         SD_BUS_VTABLE_END
 };
 
-int session_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata) {
+int session_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
         Manager *m = userdata;
         Session *session;
         int r;
@@ -524,7 +524,7 @@ char *session_bus_path(Session *s) {
         return strappend("/org/freedesktop/login1/session/", t);
 }
 
-int session_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata) {
+int session_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {
         _cleanup_strv_free_ char **l = NULL;
         Manager *m = userdata;
         Session *session;
diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index bcbd4e562..f7a9dbc24 100644
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -139,8 +139,8 @@ int session_kill(Session *s, KillWho who, int signo);
 SessionState session_get_state(Session *u);
 
 extern const sd_bus_vtable session_vtable[];
-int session_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata);
-int session_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata);
+int session_node_enumerator(sd_bus *bus, const char *path,void *userdata, char ***nodes, sd_bus_error *error);
+int session_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
 char *session_bus_path(Session *s);
 
 int session_send_signal(Session *s, bool new_session);
diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index 3942fa9be..6a77e33ee 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -235,7 +235,7 @@ const sd_bus_vtable user_vtable[] = {
         SD_BUS_VTABLE_END
 };
 
-int user_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata) {
+int user_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
         Manager *m = userdata;
         User *user;
         int r;
@@ -293,7 +293,7 @@ char *user_bus_path(User *u) {
         return s;
 }
 
-int user_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata) {
+int user_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {
         _cleanup_strv_free_ char **l = NULL;
         Manager *m = userdata;
         User *user;
diff --git a/src/login/logind-user.h b/src/login/logind-user.h
index 8d396c681..8d5f119e6 100644
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -82,8 +82,8 @@ int user_kill(User *u, int signo);
 int user_check_linger_file(User *u);
 
 extern const sd_bus_vtable user_vtable[];
-int user_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata);
-int user_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata);
+int user_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error);
+int user_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
 char *user_bus_path(User *s);
 
 int user_send_signal(User *u, bool new_user);