36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 9824f4e131b5ffea0be23dd25b24b953314f1a79 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 2/6] sd-event: drop unnecessary "else"
|
|
|
|
(cherry picked from commit 7e2bf71ca3638e36ee33215ceee386ba8013da6d)
|
|
|
|
Related: #1984406
|
|
|
|
[commit 3e7e54c63236c65aa01bb332fd5135a13e51b992 from
|
|
https://github.com/systemd-rhel/rhel-8/ (branch rhel-8.4.0)]
|
|
|
|
Signed-off-by: Li Zhou <li.zhou@windriver.com>
|
|
---
|
|
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 fcf333e..9b6d2f0 100644
|
|
--- a/src/libsystemd/sd-event/sd-event.c
|
|
+++ b/src/libsystemd/sd-event/sd-event.c
|
|
@@ -2199,8 +2199,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) {
|
|
--
|
|
2.17.1
|
|
|