From: Frank Lichtenheld <fr...@lichtenheld.com> The APIs want int (at least on unixy systems), so we use int. max_int() protects us against negative values.
Change-Id: Ie8a242838b6f8b42f36327c33fc62bb5f94ec43f Signed-off-by: Frank Lichtenheld <fr...@lichtenheld.com> Acked-by: MaxF <m...@max-fillinger.net> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1178 --- 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/+/1178 This mail reflects revision 8 of this Change. Acked-by according to Gerrit (reflected above): MaxF <m...@max-fillinger.net> diff --git a/src/openvpn/event.c b/src/openvpn/event.c index 2f60b78..ca84d19 100644 --- a/src/openvpn/event.c +++ b/src/openvpn/event.c @@ -65,11 +65,15 @@ #define SELECT_MAX_FDS 256 #endif -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif +/** Convert \c timeval value (which is in seconds and microseconds) + to a value of milliseconds which is required by multiple polling + APIs. + @param tv \c timeval to convert + + @return Milliseconds to wait. Zero if \p tv is zero. + Otherwise the return value is always greater than zero. +*/ static inline int tv_to_ms_timeout(const struct timeval *tv) { @@ -79,14 +83,11 @@ } else { - return max_int(tv->tv_sec * 1000 + (tv->tv_usec + 500) / 1000, 1); + /* might overflow but not for practically useful numbers */ + return max_int((int)(tv->tv_sec * 1000 + (tv->tv_usec + 500) / 1000), 1); } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - #ifdef _WIN32 struct we_set _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
