You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
28 lines
934 B
28 lines
934 B
2 years ago
|
From 9faf4d1a39b7fc8c9f986a808e1c0d3ed9b44357 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||
|
|
Date: Tue, 15 Jun 2021 00:44:04 +0900
|
||
|
|
Subject: [PATCH] sd-event: drop unnecessary "else"
|
||
|
|
|
||
|
|
(cherry picked from commit 7e2bf71ca3638e36ee33215ceee386ba8013da6d)
|
||
|
|
|
||
|
|
Related: #1968528
|
||
|
|
---
|
||
|
|
src/libsystemd/sd-event/sd-event.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
|
||
|
|
index 3e77f4e810..2b0b76aa1c 100644
|
||
|
|
--- a/src/libsystemd/sd-event/sd-event.c
|
||
|
|
+++ b/src/libsystemd/sd-event/sd-event.c
|
||
|
|
@@ -2883,8 +2883,8 @@ static int event_arm_timer(
|
||
|
|
|
||
|
|
if (!d->needs_rearm)
|
||
|
|
return 0;
|
||
|
|
- else
|
||
|
|
- d->needs_rearm = false;
|
||
|
|
+
|
||
|
|
+ d->needs_rearm = false;
|
||
|
|
|
||
|
|
a = prioq_peek(d->earliest);
|
||
|
|
if (!a || a->enabled == SD_EVENT_OFF || time_event_source_next(a) == USEC_INFINITY) {
|