chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: introduce watch_init() initializer for watches
[elogind.git]
/
src
/
core
/
manager.c
diff --git
a/src/core/manager.c
b/src/core/manager.c
index f932c79a1b8b35ffde66cc90d2e73279aa1b5db1..72ce2f25956fef35c1b1a482142d3c5355f1bc72 100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-1363,7
+1363,8
@@
static int process_event(Manager *m, struct epoll_event *ev) {
ssize_t k;
/* Some timer event, to be dispatched to the units */
ssize_t k;
/* Some timer event, to be dispatched to the units */
- if ((k = read(w->fd, &v, sizeof(v))) != sizeof(v)) {
+ k = read(w->fd, &v, sizeof(v));
+ if (k != sizeof(v)) {
if (k < 0 && (errno == EINTR || errno == EAGAIN))
break;
if (k < 0 && (errno == EINTR || errno == EAGAIN))
break;
@@
-2307,3
+2308,10
@@
bool manager_get_show_status(Manager *m) {
return plymouth_running();
}
return plymouth_running();
}
+
+void watch_init(Watch *w) {
+ assert(w);
+
+ w->type = WATCH_INVALID;
+ w->fd = -1;
+}