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=email
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_printf
......................................................................
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 <[email protected]>
---
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 = 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 @@
/* 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 @@
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=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iff1343a2f8cc7e32b8f36b359a00248e4dc3e8c9
Gerrit-Change-Number: 1485
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
