From: Frank Lichtenheld Date: Tue, 28 Oct 2025 18:39:35 +0000 (+0100) Subject: gremlin: Avoid some conversion warnings X-Git-Tag: v2.7_rc1~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15b77d47f5a9dc78615cdafc50bbb05d5a21c3d6;p=thirdparty%2Fopenvpn.git gremlin: Avoid some conversion warnings We know these casts are safe, so make them explicit. Change-Id: I2554b9baec6af191b0adb137e64124586dc4331c Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1286 Message-Id: <20251028183945.31901-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg33964.html Signed-off-by: Gert Doering --- diff --git a/src/openvpn/gremlin.c b/src/openvpn/gremlin.c index 0e5e93fab..a3dbff158 100644 --- a/src/openvpn/gremlin.c +++ b/src/openvpn/gremlin.c @@ -98,11 +98,6 @@ flip(int n) return (get_random() % n) == 0; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - /* * Return uniformly distributed random number between * low and high. @@ -112,7 +107,7 @@ roll(int low, int high) { int ret; ASSERT(low <= high); - ret = low + (get_random() % (high - low + 1)); + ret = low + (int)(get_random() % (high - low + 1)); ASSERT(ret >= low && ret <= high); return ret; } @@ -195,7 +190,7 @@ corrupt_gremlin(struct buffer *buf, int flags) { if (buf->len > 0) { - uint8_t r = roll(0, 255); + uint8_t r = (uint8_t)roll(0, 255); int method = roll(0, 5); switch (method) @@ -235,8 +230,4 @@ corrupt_gremlin(struct buffer *buf, int flags) } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - #endif /* ifdef ENABLE_DEBUG */