cron2 has uploaded a new patch set (#7) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1207?usp=email )
The following approvals got outdated and were removed: Code-Review+2 by plaisthos Change subject: Enable -Wtype-limits by default (via -Wextra) ...................................................................... Enable -Wtype-limits by default (via -Wextra) Removes a few smaller instances: - Fix return type check for socket() on Windows/Unixy - Ignore a few instances related to WSAWaitForMultipleEvents. The compiler says the check is currently useless, but we follow the API documentation. Change-Id: Iaabddb6f81cd94863291b193aae9d384a8f9d871 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Arne Schwabe <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1207 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg34317.html Signed-off-by: Gert Doering <[email protected]> --- M CMakeLists.txt M configure.ac M src/openvpn/event.c M src/openvpn/socket.c 4 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/07/1207/7 diff --git a/CMakeLists.txt b/CMakeLists.txt index c9301e6..e812145 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,7 +114,7 @@ check_and_add_compiler_flag(-Wstrict-prototypes StrictPrototypes) check_and_add_compiler_flag(-Wold-style-definition OldStyleDefinition) add_compile_options(-Wconversion -Wno-sign-conversion) - add_compile_options(-Wextra -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter) + add_compile_options(-Wextra -Wno-sign-compare -Wno-unused-parameter) # clang doesn't have the different levels but also doesn't include it in -Wextra check_and_add_compiler_flag(-Wimplicit-fallthrough=2 GCCImplicitFallthrough) if (WIN32) diff --git a/configure.ac b/configure.ac index 3117e13..f6e4b6d 100644 --- a/configure.ac +++ b/configure.ac @@ -1410,7 +1410,7 @@ ACL_CHECK_ADD_COMPILE_FLAGS([-Wold-style-definition]) ACL_CHECK_ADD_COMPILE_FLAGS([-Wconversion -Wno-sign-conversion]) ACL_CHECK_ADD_COMPILE_FLAGS([-Wall]) -ACL_CHECK_ADD_COMPILE_FLAGS([-Wextra -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter]) +ACL_CHECK_ADD_COMPILE_FLAGS([-Wextra -Wno-sign-compare -Wno-unused-parameter]) # clang doesn't have the different levels but also doesn't include it in -Wextra ACL_CHECK_ADD_COMPILE_FLAGS([-Wimplicit-fallthrough=2]) if test "${WIN32}" = "yes"; then diff --git a/src/openvpn/event.c b/src/openvpn/event.c index ca84d19..ca2d0c1 100644 --- a/src/openvpn/event.c +++ b/src/openvpn/event.c @@ -410,6 +410,13 @@ } #endif + /* WSA_WAIT_EVENT_0 == 0 but the API documentation is written in a way + that doesn't guarantee that. So we make useless checks. */ +#if defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wtype-limits" +#endif + /* * First poll our event list with 0 timeout */ @@ -474,6 +481,9 @@ return -1; } } +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif } static struct event_set * diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 8eac96d..f7317d1 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -577,7 +577,8 @@ ASSERT(addrinfo); ASSERT(addrinfo->ai_socktype == SOCK_STREAM); - if ((sd = socket(addrinfo->ai_family, addrinfo->ai_socktype, addrinfo->ai_protocol)) < 0) + if ((sd = socket(addrinfo->ai_family, addrinfo->ai_socktype, addrinfo->ai_protocol)) + == SOCKET_UNDEFINED) { msg(M_ERR, "Cannot create TCP socket"); } @@ -608,7 +609,8 @@ ASSERT(addrinfo); ASSERT(addrinfo->ai_socktype == SOCK_DGRAM); - if ((sd = socket(addrinfo->ai_family, addrinfo->ai_socktype, addrinfo->ai_protocol)) < 0) + if ((sd = socket(addrinfo->ai_family, addrinfo->ai_socktype, addrinfo->ai_protocol)) + == SOCKET_UNDEFINED) { msg(M_ERR, "UDP: Cannot create UDP/UDP6 socket"); } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1207?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: Iaabddb6f81cd94863291b193aae9d384a8f9d871 Gerrit-Change-Number: 1207 Gerrit-PatchSet: 7 Gerrit-Owner: flichtenheld <[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
