chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fix serilization of ListJobs() response
[elogind.git]
/
src
/
core
/
dbus.c
diff --git
a/src/core/dbus.c
b/src/core/dbus.c
index 35d185a601a950be0100350422ead136c264836b..3d8da1e6ada179e8a12b3c666ce4e09976ef73a4 100644
(file)
--- a/
src/core/dbus.c
+++ b/
src/core/dbus.c
@@
-71,7
+71,7
@@
int bus_send_queued_message(Manager *m) {
return 0;
}
return 0;
}
-static int signal_agent_released(sd_bus *bus, sd_bus_message *message, void *userdata) {
+static int signal_agent_released(sd_bus *bus, sd_bus_message *message, void *userdata
, sd_bus_error *error
) {
Manager *m = userdata;
const char *cgroup;
int r;
Manager *m = userdata;
const char *cgroup;
int r;
@@
-100,7
+100,7
@@
static int signal_agent_released(sd_bus *bus, sd_bus_message *message, void *use
return 0;
}
return 0;
}
-static int signal_disconnected(sd_bus *bus, sd_bus_message *message, void *userdata) {
+static int signal_disconnected(sd_bus *bus, sd_bus_message *message, void *userdata
, sd_bus_error *error
) {
Manager *m = userdata;
assert(bus);
Manager *m = userdata;
assert(bus);
@@
-119,7
+119,7
@@
static int signal_disconnected(sd_bus *bus, sd_bus_message *message, void *userd
return 0;
}
return 0;
}
-static int signal_name_owner_changed(sd_bus *bus, sd_bus_message *message, void *userdata) {
+static int signal_name_owner_changed(sd_bus *bus, sd_bus_message *message, void *userdata
, sd_bus_error *error
) {
const char *name, *old_owner, *new_owner;
Manager *m = userdata;
int r;
const char *name, *old_owner, *new_owner;
Manager *m = userdata;
int r;
@@
-142,7
+142,7
@@
static int signal_name_owner_changed(sd_bus *bus, sd_bus_message *message, void
return 0;
}
return 0;
}
-static int signal_activation_request(sd_bus *bus, sd_bus_message *message, void *userdata) {
+static int signal_activation_request(sd_bus *bus, sd_bus_message *message, void *userdata
, sd_bus_error *ret_error
) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
Manager *m = userdata;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
Manager *m = userdata;
@@
-194,7
+194,7
@@
failed:
return 0;
}
return 0;
}
- r = sd_bus_message_append(reply, "sss", error.name, error.message);
+ r = sd_bus_message_append(reply, "sss",
name,
error.name, error.message);
if (r < 0) {
bus_log_create_error(r);
return 0;
if (r < 0) {
bus_log_create_error(r);
return 0;