core: fix event source annotations
These looked like a mass-replace gone slightly wrong – two statements with no { }'s, and no error checking.
This commit is contained in:
parent
966c66e349
commit
cfa9677bd1
|
@ -291,13 +291,15 @@ static int busname_watch_fd(BusName *n) {
|
|||
r = sd_event_source_set_enabled(n->starter_event_source, SD_EVENT_ON);
|
||||
else
|
||||
r = sd_event_add_io(UNIT(n)->manager->event, &n->starter_event_source, n->starter_fd, EPOLLIN, busname_dispatch_io, n);
|
||||
(void) sd_event_source_set_description(n->starter_event_source, "busname-starter");
|
||||
|
||||
if (r < 0) {
|
||||
log_unit_warning_errno(UNIT(n)->id, r, "Failed to watch starter fd: %m");
|
||||
busname_unwatch_fd(n);
|
||||
return r;
|
||||
}
|
||||
|
||||
(void) sd_event_source_set_description(n->starter_event_source, "busname-starter");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -90,6 +90,7 @@ static void manager_undo_generators(Manager *m);
|
|||
|
||||
static void manager_watch_jobs_in_progress(Manager *m) {
|
||||
usec_t next;
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
|
||||
|
@ -97,12 +98,14 @@ static void manager_watch_jobs_in_progress(Manager *m) {
|
|||
return;
|
||||
|
||||
next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC;
|
||||
(void) sd_event_add_time(
|
||||
r = sd_event_add_time(
|
||||
m->event,
|
||||
&m->jobs_in_progress_event_source,
|
||||
CLOCK_MONOTONIC,
|
||||
next, 0,
|
||||
manager_dispatch_jobs_in_progress, m);
|
||||
if (r < 0)
|
||||
return;
|
||||
|
||||
(void) sd_event_source_set_description(m->jobs_in_progress_event_source, "manager-jobs-in-progress");
|
||||
}
|
||||
|
|
|
@ -1272,11 +1272,12 @@ static int socket_watch_fds(Socket *s) {
|
|||
else
|
||||
r = sd_event_add_io(UNIT(s)->manager->event, &p->event_source, p->fd, EPOLLIN, socket_dispatch_io, p);
|
||||
|
||||
(void) sd_event_source_set_description(p->event_source, "socket-port-io");
|
||||
if (r < 0) {
|
||||
log_unit_warning_errno(UNIT(s)->id, r, "Failed to watch listening fds: %m");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
(void) sd_event_source_set_description(p->event_source, "socket-port-io");
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
Loading…
Reference in New Issue