diff options
| author | Luca Boccassi <luca.boccassi@microsoft.com> | 2021-11-10 23:18:06 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-11-12 22:13:24 +0100 |
| commit | c3c50474d2dc31a84fb76c866cc6347808d54b2a (patch) | |
| tree | 5277f212a88fa1ee6d131ba9ac3a73b03c3c3057 | |
| parent | fe0777fb94cbbd9359832f3c305e8479de78af58 (diff) | |
| download | systemd-c3c50474d2dc31a84fb76c866cc6347808d54b2a.tar.gz | |
tree-wide: don't ignore return code from sd_event_source_set_enabled()
CID#1465793
CID#1465794
CID#1465795
| -rw-r--r-- | src/journal-remote/journal-remote.c | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-event/sd-event.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 13a9f74e6f..0539d4d0bf 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -243,13 +243,13 @@ int journal_remote_add_source(RemoteServer *s, int fd, char* name, bool own_name r = sd_event_add_defer(s->events, &source->buffer_event, dispatch_raw_source_until_block, source); if (r == 0) - sd_event_source_set_enabled(source->buffer_event, SD_EVENT_OFF); + r = sd_event_source_set_enabled(source->buffer_event, SD_EVENT_OFF); } else if (r == -EPERM) { log_debug("Falling back to sd_event_add_defer for fd:%d (%s)", fd, name); r = sd_event_add_defer(s->events, &source->event, dispatch_blocking_source_event, source); if (r == 0) - sd_event_source_set_enabled(source->event, SD_EVENT_ON); + r = sd_event_source_set_enabled(source->event, SD_EVENT_ON); } if (r < 0) { log_error_errno(r, "Failed to register event source for fd:%d: %m", diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index d8f84d9ba7..37efe3f425 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -3691,7 +3691,7 @@ static int source_dispatch(sd_event_source *s) { if (s->n_ref == 0) source_free(s); else if (r < 0) - sd_event_source_set_enabled(s, SD_EVENT_OFF); + assert_se(sd_event_source_set_enabled(s, SD_EVENT_OFF) >= 0); return 1; } @@ -3732,7 +3732,7 @@ static int event_prepare(sd_event *e) { if (s->n_ref == 0) source_free(s); else if (r < 0) - sd_event_source_set_enabled(s, SD_EVENT_OFF); + assert_se(sd_event_source_set_enabled(s, SD_EVENT_OFF) >= 0); } return 0; |