status: Avoid conversion warnings in status_read/status_printf

Just use explicit casts. len is limited by BCAP and
c is limited by being from buf_read_u8. So they are
safe.

In case of status_printf this is only for Windows.
len is limited by sizeof(buf), so also a safe cast.

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

diff --git a/src/openvpn/status.c b/src/openvpn/status.c
index 3f57244028afb0229ab4fb4c84a9b74f541384be..d09f3670bf837c49c3eb08ebf2db205de5ce64ce 100644 (file)
--- a/src/openvpn/status.c
+++ b/src/openvpn/status.c
@@ -206,11 +206,6 @@ status_close(struct status_output *so)
     return ret;
 }
 
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
 #define STATUS_PRINTF_MAXLEN 512
 
 void
@@ -243,7 +238,7 @@ status_printf(struct status_output *so, const char *format, ...)
             size_t len = strlen(buf);
             if (len > 0)
             {
-                if (write(so->fd, buf, len) != len)
+                if (write(so->fd, buf, (unsigned int)len) != len)
                 {
                     so->errors = true;
                 }
@@ -274,16 +269,14 @@ status_read(struct status_output *so, struct buffer *buf)
             /* read more of file into buffer */
             if (c == -1)
             {
-                int len;
-
                 ASSERT(buf_init(&so->read_buf, 0));
-                len = read(so->fd, BPTR(&so->read_buf), BCAP(&so->read_buf));
+                ssize_t len = read(so->fd, BPTR(&so->read_buf), BCAP(&so->read_buf));
                 if (len <= 0)
                 {
                     break;
                 }
 
-                ASSERT(buf_inc_len(&so->read_buf, len));
+                ASSERT(buf_inc_len(&so->read_buf, (int)len));
                 continue;
             }
 
@@ -299,7 +292,7 @@ status_read(struct status_output *so, struct buffer *buf)
                 break;
             }
 
-            buf_write_u8(buf, c);
+            buf_write_u8(buf, (uint8_t)c);
         }
 
         buf_null_terminate(buf);
@@ -307,7 +300,3 @@ status_read(struct status_output *so, struct buffer *buf)
 
     return ret;
 }
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif