]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tree-wide: don't ignore return code from sd_event_source_set_enabled()
authorLuca Boccassi <luca.boccassi@microsoft.com>
Wed, 10 Nov 2021 23:18:06 +0000 (23:18 +0000)
committerLennart Poettering <lennart@poettering.net>
Fri, 12 Nov 2021 21:13:24 +0000 (22:13 +0100)
CID#1465793
CID#1465794
CID#1465795

src/journal-remote/journal-remote.c
src/libsystemd/sd-event/sd-event.c

index 13a9f74e6f013e8a678dc19d765cd338d05c1b8b..0539d4d0bf4584ca9b34c826ec3432986e634d9b 100644 (file)
@@ -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",
index d8f84d9ba7187f0bdfdd69928d73a8a59e10cd80..37efe3f425a53cab566a1fcbd05f29b2f645db67 100644 (file)
@@ -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;