chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
api: in constructor function calls, always put the returned object pointer first...
[elogind.git]
/
src
/
core
/
dbus.c
diff --git
a/src/core/dbus.c
b/src/core/dbus.c
index 4111a14ee0fa51982ae1e09dd13fb16306d8daf9..10594157114962ecadc05ef0825d350acad81f78 100644
(file)
--- a/
src/core/dbus.c
+++ b/
src/core/dbus.c
@@
-190,7
+190,7
@@
failed:
log_debug("D-Bus activation failed for %s: %s", name, bus_error_message(&error, r));
log_debug("D-Bus activation failed for %s: %s", name, bus_error_message(&error, r));
- r = sd_bus_message_new_signal(bus,
"/org/freedesktop/systemd1", "org.freedesktop.systemd1.Activator", "ActivationFailure", &reply
);
+ r = sd_bus_message_new_signal(bus,
&reply, "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Activator", "ActivationFailure"
);
if (r < 0) {
bus_log_create_error(r);
return 0;
if (r < 0) {
bus_log_create_error(r);
return 0;
@@
-994,7
+994,7
@@
static int bus_init_private(Manager *m) {
return -errno;
}
return -errno;
}
- r = sd_event_add_io(m->event,
fd, EPOLLIN, bus_on_connection, m, &s
);
+ r = sd_event_add_io(m->event,
&s, fd, EPOLLIN, bus_on_connection, m
);
if (r < 0) {
log_error("Failed to allocate event source: %s", strerror(-r));
return r;
if (r < 0) {
log_error("Failed to allocate event source: %s", strerror(-r));
return r;