From: "flichtenheld (Code Review)"
Date: Thu, 22 Jan 2026 14:01:14 +0000
In-Reply-To:
References:
Reply-To: frank@...2641..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net
Message-ID:
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="2uuNniQpeos="; charset=UTF-8
Subject: [Openvpn-devel] [S] Change in openvpn[master]: status: Avoid
conversion warnings in status_read/status_printf
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: plaisthos
Cc: openvpn-devel
--2uuNniQpeos=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1485?usp=3Demail
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+2 by plaisthos
Change subject: status: Avoid conversion warnings in status_read/status_pri=
ntf
......................................................................
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
---
M src/openvpn/status.c
1 file changed, 4 insertions(+), 15 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/85/1485/2
diff --git a/src/openvpn/status.c b/src/openvpn/status.c
index 3f57244..d09f367 100644
--- a/src/openvpn/status.c
+++ b/src/openvpn/status.c
@@ -206,11 +206,6 @@
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 @@
size_t len =3D strlen(buf);
if (len > 0)
{
- if (write(so->fd, buf, len) !=3D len)
+ if (write(so->fd, buf, (unsigned int)len) !=3D len)
{
so->errors =3D true;
}
@@ -274,16 +269,14 @@
/* read more of file into buffer */
if (c =3D=3D -1)
{
- int len;
-
ASSERT(buf_init(&so->read_buf, 0));
- len =3D read(so->fd, BPTR(&so->read_buf), BCAP(&so->read_b=
uf));
+ ssize_t len =3D read(so->fd, BPTR(&so->read_buf), BCAP(&so=
->read_buf));
if (len <=3D 0)
{
break;
}
- ASSERT(buf_inc_len(&so->read_buf, len));
+ ASSERT(buf_inc_len(&so->read_buf, (int)len));
continue;
}
@@ -299,7 +292,7 @@
break;
}
- buf_write_u8(buf, c);
+ buf_write_u8(buf, (uint8_t)c);
}
buf_null_terminate(buf);
@@ -307,7 +300,3 @@
return ret;
}
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1485?usp=3Demail
To unsubscribe, or for help writing mail filters, visit http://gerrit.openv=
pn.net/settings?usp=3Demail
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iff1343a2f8cc7e32b8f36b359a00248e4dc3e8c9
Gerrit-Change-Number: 1485
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-Attention: flichtenheld
--2uuNniQpeos=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is cur=
rently required from: flichtenheld, plaisthos.
flichtenheld uploaded patch set #2 to this change.
<=
p>View C=
hange
The following approvals got outdated and were removed:
Code-Review+2 by plaisthos
status: Avoid conversion warnin=
gs in status_read/status_printf
Just use explicit casts. len is limi=
ted by BCAP and
c is limited by being from buf_read_u8. So they are
s=
afe.
In case of status_printf this is only for Windows.
len is li=
mited by sizeof(buf), so also a safe cast.
Change-Id: Iff1343a2f8cc7=
e32b8f36b359a00248e4dc3e8c9
Signed-off-by: Frank Lichtenheld <frank@...220...=
..2641...>
---
M src/openvpn/status.c
1 file changed, 4 inserti=
ons(+), 15 deletions(-)
git pull ssh://gerrit.op=
envpn.net:29418/openvpn refs/changes/85/1485/2
diff --git a/src/ope=
nvpn/status.c b/src/openvpn/status.c
index 3f57244..d09f367=
100644
--- a/src/openvpn/status.c
+++ b/sr=
c/openvpn/status.c
@@ -206,11 +206,6 @@
=
return ret;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic p=
ush
-#pragma GCC diagno=
stic ignored "-Wconversion"
-#endif
=
-
#define STATUS_PRINTF_MAXLEN 512
void
@@ -243,7 +238,7 @@
=
size_t len =3D strlen(buf);
if (len >=
; 0)
{
- if (write(so->fd, buf, len) !=3D len)
+ if (writ=
e(so->fd, buf, (unsigned int)len) !=3D len)
=
{
so->errors =3D true;<=
br> }
@@ -274,16 +269,14 @@
/* read more of file into buffer */
=
if (c =3D=3D -1)
{
- int len;
-
AS=
SERT(buf_init(&so->read_buf, 0));
- len =3D read(so->fd, BPTR(&so->=
;read_buf), BCAP(&so->read_buf));
+ ssize_t len =3D read(so->fd, BPTR(&=
amp;so->read_buf), BCAP(&so->read_buf));
=
if (len <=3D 0)
{
break;
}
- =
ASSERT(buf_inc_len(&so->read_buf, len));
+ ASSERT(buf_inc_len(&s=
o->read_buf, (int)len));
continue;
}
@@ -299,7 +292=
,7 @@
break;
=
}
- =
buf_write_u8(buf, c);
+ buf_write_u8(buf, (uint8_t)c);
=
}
buf_null_terminate(buf);<=
/span>
@@ -307,7 +300,3 @@
=
return ret;
}
-
-#if defined(=
__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
To view, visit change 148=
5. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iff1343a2f8cc7e32b8f36b359a0=
0248e4dc3e8c9
Gerrit-Change-Number: 1485
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...=
.>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...=
.1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...=
ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...=
..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...=
41...>
=
--2uuNniQpeos=--