diff mbox series

[Openvpn-devel,v3] reliable: Avoid conversion warning in reliable_send_timeout

Message ID 20260813180856.3208-1-gert@greenie.muc.de
State New
Headers
Series [Openvpn-devel,v3] reliable: Avoid conversion warning in reliable_send_timeout |

Commit Message

Gert Doering Aug. 13, 2026, 6:08 p.m. UTC 
  From: Frank Lichtenheld <frank@lichtenheld.com>

It is not realistic that this produced big values
and we already discard negative values. So just use
whatever we get.

Change-Id: Iac4af315c6d7798f09a27383fc0a755a874b9881
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Razvan Cojocaru <razvanc@mailbox.org>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1480
---

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/+/1480
This mail reflects revision 3 of this Change.

Acked-by according to Gerrit (reflected above):
Razvan Cojocaru <razvanc@mailbox.org>
diff mbox series

Patch

diff --git a/src/openvpn/reliable.c b/src/openvpn/reliable.c
index 52adacf..690e50d6 100644
--- a/src/openvpn/reliable.c
+++ b/src/openvpn/reliable.c
@@ -687,11 +687,6 @@ 
     }
 }
 
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
 /* in how many seconds should we wake up to check for timeout */
 /* if we return BIG_TIMEOUT, nothing to wait for */
 interval_t
@@ -713,7 +708,7 @@ 
             }
             else
             {
-                ret = min_int(ret, e->next_try - local_now);
+                ret = min_int(ret, (int)(e->next_try - local_now));
             }
         }
     }
@@ -724,10 +719,6 @@ 
     return ret;
 }
 
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
 /*
  * Enable an incoming buffer previously returned by a get function as active.
  */