chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
event: be more conservative when returning errors from event handler callbacks
[elogind.git]
/
src
/
core
/
manager.c
diff --git
a/src/core/manager.c
b/src/core/manager.c
index f06df54d910806401659416f60954cb6b92df516..a2f3570bb624eb66680896fc45378803dc80e0c6 100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-22,9
+22,7
@@
#include <assert.h>
#include <errno.h>
#include <string.h>
#include <assert.h>
#include <errno.h>
#include <string.h>
-#include <sys/epoll.h>
#include <signal.h>
#include <signal.h>
-#include <sys/signalfd.h>
#include <sys/wait.h>
#include <unistd.h>
#include <sys/poll.h>
#include <sys/wait.h>
#include <unistd.h>
#include <sys/poll.h>
@@
-1633,7
+1631,7
@@
static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
}
if (sigchld)
}
if (sigchld)
-
return
manager_dispatch_sigchld(m);
+ manager_dispatch_sigchld(m);
return 0;
}
return 0;
}
@@
-2211,10
+2209,8
@@
int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
}
finish:
}
finish:
- if (ferror(f))
{
+ if (ferror(f))
r = -EIO;
r = -EIO;
- goto finish;
- }
assert(m->n_reloading > 0);
m->n_reloading --;
assert(m->n_reloading > 0);
m->n_reloading --;