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
/
automount.c
diff --git
a/src/core/automount.c
b/src/core/automount.c
index f500850f8393d5867ef4f712e33aa8c6859939ef..889b20e25dd7addeb04d733e2663652a96e6f1df 100644
(file)
--- a/
src/core/automount.c
+++ b/
src/core/automount.c
@@
-256,7
+256,7
@@
static int automount_coldplug(Unit *u) {
assert(a->pipe_fd >= 0);
assert(a->pipe_fd >= 0);
- r = sd_event_add_io(u->manager->event,
a->pipe_fd, EPOLLIN, automount_dispatch_io, u, &a->pipe_event_source
);
+ r = sd_event_add_io(u->manager->event,
&a->pipe_event_source, a->pipe_fd, EPOLLIN, automount_dispatch_io, u
);
if (r < 0)
return r;
}
if (r < 0)
return r;
}
@@
-531,7
+531,7
@@
static void automount_enter_waiting(Automount *a) {
close_nointr_nofail(ioctl_fd);
ioctl_fd = -1;
close_nointr_nofail(ioctl_fd);
ioctl_fd = -1;
- r = sd_event_add_io(UNIT(a)->manager->event,
p[0], EPOLLIN, automount_dispatch_io, a, &a->pipe_event_source
);
+ r = sd_event_add_io(UNIT(a)->manager->event,
&a->pipe_event_source, p[0], EPOLLIN, automount_dispatch_io, a
);
if (r < 0)
goto fail;
if (r < 0)
goto fail;