Skip to content

Commit eb0666c

Browse files
flichtenheldcron2
authored andcommitted
interval: Fix conversion warning
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 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>
1 parent f265486 commit eb0666c

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

src/openvpn/interval.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ interval_init(struct interval *top, int horizon, int refresh)
3838
top->horizon = horizon;
3939
}
4040

41-
#if defined(__GNUC__) || defined(__clang__)
42-
#pragma GCC diagnostic push
43-
#pragma GCC diagnostic ignored "-Wconversion"
44-
#endif
45-
4641
bool
4742
event_timeout_trigger(struct event_timeout *et, struct timeval *tv, const int et_const_retry)
4843
{
@@ -52,7 +47,7 @@ event_timeout_trigger(struct event_timeout *et, struct timeval *tv, const int et
5247
}
5348

5449
bool ret = false;
55-
time_t wakeup = event_timeout_remaining(et);
50+
interval_t wakeup = event_timeout_remaining(et);
5651

5752
if (wakeup <= 0)
5853
{
@@ -82,7 +77,3 @@ event_timeout_trigger(struct event_timeout *et, struct timeval *tv, const int et
8277
}
8378
return ret;
8479
}
85-
86-
#if defined(__GNUC__) || defined(__clang__)
87-
#pragma GCC diagnostic pop
88-
#endif

0 commit comments

Comments
 (0)