cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1250?usp=email )
Change subject: mtu: Trivial -Wconversion fix ...................................................................... mtu: Trivial -Wconversion fix Just use the correct type. Change-Id: I8919c9efdf85424a124a0d54593cd1dbf3bc2341 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1250 Message-Id: <[email protected]> URL: https://sourceforge.net/p/openvpn/mailman/message/59242982/ Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/mtu.c 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/openvpn/mtu.c b/src/openvpn/mtu.c index 66f81a6..9e152df 100644 --- a/src/openvpn/mtu.c +++ b/src/openvpn/mtu.c @@ -280,15 +280,9 @@ struct timeval tv; }; -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - const char * format_extended_socket_error(int fd, int *mtu, struct gc_arena *gc) { - int res; struct probehdr rcvbuf; struct iovec iov; struct msghdr msg; @@ -313,7 +307,7 @@ msg.msg_control = cbuf; msg.msg_controllen = 256; /* size of cbuf */ - res = recvmsg(fd, &msg, MSG_ERRQUEUE); + ssize_t res = recvmsg(fd, &msg, MSG_ERRQUEUE); if (res < 0) { goto exit; @@ -394,10 +388,6 @@ return BSTR(&out); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - void set_sock_extended_error_passing(int sd, sa_family_t proto_af) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1250?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I8919c9efdf85424a124a0d54593cd1dbf3bc2341 Gerrit-Change-Number: 1250 Gerrit-PatchSet: 3 Gerrit-Owner: flichtenheld <[email protected]> Gerrit-Reviewer: cron2 <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
