diff mbox series

[Openvpn-devel,v5] interval: Fix conversion warning

Message ID 20251116135909.15964-1-gert@greenie.muc.de
State New
Headers show
Series [Openvpn-devel,v5] interval: Fix conversion warning | expand

Commit Message

Gert Doering Nov. 16, 2025, 1:59 p.m. UTC 
From: Frank Lichtenheld <frank@lichtenheld.com>

Use correct return type of the function.

Change-Id: I445b2e2cd14e55cc1ae3efdf1650b28e18992aa5
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1291
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1291
This mail reflects revision 5 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <gert@greenie.muc.de>

Comments

Gert Doering Nov. 16, 2025, 5:47 p.m. UTC | #1 
Stared-at-code, straightforward enough.  Did not test beyond a test compile.

Your patch has been applied to the master branch.

commit eb0666c8dcd7a09528594d1ce172aadb3be2d0cf
Author: Frank Lichtenheld
Date:   Sun Nov 16 14:59:04 2025 +0100

     interval: Fix conversion warning

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1291
     Message-Id: <20251116135909.15964-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg34464.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/src/openvpn/interval.c b/src/openvpn/interval.c
index fbefcd9..f9953a6 100644
--- a/src/openvpn/interval.c
+++ b/src/openvpn/interval.c
@@ -38,11 +38,6 @@ 
     top->horizon = horizon;
 }
 
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
 bool
 event_timeout_trigger(struct event_timeout *et, struct timeval *tv, const int et_const_retry)
 {
@@ -52,7 +47,7 @@ 
     }
 
     bool ret = false;
-    time_t wakeup = event_timeout_remaining(et);
+    interval_t wakeup = event_timeout_remaining(et);
 
     if (wakeup <= 0)
     {
@@ -82,7 +77,3 @@ 
     }
     return ret;
 }
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif