Attention is currently required from: flichtenheld.
Hello plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1313?usp=email
to look at the new patch set (#6).
The change is no longer submittable: checks~ChecksSubmitRule is unsatisfied now.
Change subject: multi: Fix various conversion warnings
......................................................................
multi: Fix various conversion warnings
Mostly make required casts explicit.
Change-Id: I88cd7e1ebb49e97db33bad75c4fbbe23d196e964
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/multi.c
1 file changed, 8 insertions(+), 15 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/13/1313/6
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index ccf6239..da7cca3 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -245,11 +245,6 @@
#endif
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
#ifdef ENABLE_ASYNC_PUSH
static uint32_t
/*
@@ -2809,8 +2804,8 @@
multi_process_file_closed(struct multi_context *m, const unsigned int
mpp_flags)
{
char buffer[INOTIFY_EVENT_BUFFER_SIZE];
- size_t buffer_i = 0;
- int r = read(m->top.c2.inotify_fd, buffer, INOTIFY_EVENT_BUFFER_SIZE);
+ ssize_t buffer_i = 0;
+ ssize_t r = read(m->top.c2.inotify_fd, buffer, INOTIFY_EVENT_BUFFER_SIZE);
while (buffer_i < r)
{
@@ -2942,21 +2937,23 @@
static inline unsigned int
compute_wakeup_sigma(const struct timeval *delta)
{
+ ASSERT(delta->tv_sec >= 0);
+ ASSERT(delta->tv_usec >= 0);
if (delta->tv_sec < 1)
{
/* if < 1 sec, fuzz = # of microseconds / 8 */
- return delta->tv_usec >> 3;
+ return (unsigned int)(delta->tv_usec >> 3);
}
else
{
/* if < 10 minutes, fuzz = 13.1% of timeout */
if (delta->tv_sec < 600)
{
- return delta->tv_sec << 17;
+ return (unsigned int)(delta->tv_sec << 17);
}
else
{
- return 120000000; /* if >= 10 minutes, fuzz = 2 minutes */
+ return 120 * 1000000; /* if >= 10 minutes, fuzz = 2 minutes */
}
}
}
@@ -3751,7 +3748,7 @@
for (i = 0; i < parm.packet_size; ++i)
{
- ASSERT(buf_write_u8(&buf, get_random() & 0xFF));
+ ASSERT(buf_write_u8(&buf, (uint8_t)(get_random() & 0xFF)));
}
for (i = 0; i < parm.n_packets; ++i)
@@ -3967,10 +3964,6 @@
return count;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
static void
management_delete_event(void *arg, event_t event)
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1313?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: I88cd7e1ebb49e97db33bad75c4fbbe23d196e964
Gerrit-Change-Number: 1313
Gerrit-PatchSet: 6
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
