various: remove unnecessary check before sd_event_source_set_enabled()

sd_event_source_set_enabled() does the same check internally.

diff --git a/src/core/automount.c b/src/core/automount.c
index 6cb9d525c2ee60b83a87951477ad18aaedce56fb..a7b08d60adfece67dc6a67ddbbb5317aa64b9d29 100644 (file)
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -734,9 +734,6 @@ static int automount_start_expire(Automount *a) {
 static void automount_stop_expire(Automount *a) {
         assert(a);
 
-        if (!a->expire_event_source)
-                return;
-
         (void) sd_event_source_set_enabled(a->expire_event_source, SD_EVENT_OFF);
 }
 

diff --git a/src/core/socket.c b/src/core/socket.c
index 41147d4bf74e0211f17988c01141b6fe3954049a..8839a26d5056239b0bc75365e8af8092c7084c55 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1734,9 +1734,6 @@ static void socket_unwatch_fds(Socket *s) {
                 if (p->fd < 0)
                         continue;
 
-                if (!p->event_source)
-                        continue;
-
                 r = sd_event_source_set_enabled(p->event_source, SD_EVENT_OFF);
                 if (r < 0)
                         log_unit_debug_errno(UNIT(s), r, "Failed to disable event source: %m");

diff --git a/src/core/timer.c b/src/core/timer.c
index d7ce4733c01528bd56a37de6fc224dd342c385b0..7cb58cc2d9d6e6921b308a71666d8b311c1faa73 100644 (file)
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -514,7 +514,6 @@ static void timer_enter_waiting(Timer *t, bool time_change) {
                                 goto fail;
                         }
                 } else {
-
                         r = sd_event_add_time(
                                         UNIT(t)->manager->event,
                                         &t->monotonic_event_source,
@@ -529,8 +528,7 @@ static void timer_enter_waiting(Timer *t, bool time_change) {
                         (void) sd_event_source_set_description(t->monotonic_event_source, "timer-monotonic");
                 }
 
-        } else if (t->monotonic_event_source) {
-
+        } else {
                 r = sd_event_source_set_enabled(t->monotonic_event_source, SD_EVENT_OFF);
                 if (r < 0) {
                         log_unit_warning_errno(UNIT(t), r, "Failed to disable monotonic event source: %m");

diff --git a/src/import/curl-util.c b/src/import/curl-util.c
index 1628f833a970a0e7d50e7438ccf3b60f5aebf927..4b65f4619fbd1bd114f09686291779ed8946ea1d 100644 (file)
--- a/src/import/curl-util.c
+++ b/src/import/curl-util.c
@@ -142,10 +142,8 @@ static int curl_glue_timer_callback(CURLM *curl, long timeout_ms, void *userdata
         }
 
         if (timeout_ms < 0) {
-                if (g->timer) {
-                        if (sd_event_source_set_enabled(g->timer, SD_EVENT_OFF) < 0)
-                                return -1;
-                }
+                if (sd_event_source_set_enabled(g->timer, SD_EVENT_OFF) < 0)
+                        return -1;
 
                 return 0;
         }

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 717c8e480e5e042b40f81d1216f99ca9f71e2bc1..211f5c3d83bb88b6b0e0cff658679251fbe38ca6 100644 (file)
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -784,12 +784,10 @@ static void server_sync(Server *s, bool wait) {
                                                     "Failed to sync user journal, ignoring: %m");
         }
 
-        if (s->sync_event_source) {
-                r = sd_event_source_set_enabled(s->sync_event_source, SD_EVENT_OFF);
-                if (r < 0)
-                        log_ratelimit_error_errno(r, JOURNAL_LOG_RATELIMIT,
-                                                  "Failed to disable sync timer source: %m");
-        }
+        r = sd_event_source_set_enabled(s->sync_event_source, SD_EVENT_OFF);
+        if (r < 0)
+                log_ratelimit_warning_errno(r, JOURNAL_LOG_RATELIMIT,
+                                            "Failed to disable sync timer source, ignoring: %m");
 
         s->sync_scheduled = false;
 }

diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index dd9fa071538d5f490a8ae1de155d389a6460f4fe..7648a6ce7d8f604725d1c52f313e35301d981420 100644 (file)
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -472,11 +472,9 @@ static int add_connection_socket(Context *context, int fd) {
                 return 0;
         }
 
-        if (context->idle_time) {
-                r = sd_event_source_set_enabled(context->idle_time, SD_EVENT_OFF);
-                if (r < 0)
-                        log_warning_errno(r, "Unable to disable idle timer, continuing: %m");
-        }
+        r = sd_event_source_set_enabled(context->idle_time, SD_EVENT_OFF);
+        if (r < 0)
+                log_warning_errno(r, "Unable to disable idle timer, continuing: %m");
 
         c = new(Connection, 1);
         if (!c) {