cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1205?usp=email )
Change subject: Make unit tests -Wconversion clean ...................................................................... Make unit tests -Wconversion clean Only trivial problems left after the other patches have been merged. Change-Id: Iab9e780d9649d7581e5f6aa4b23e72bbed5e145b Signed-off-by: Frank Lichtenheld <fr...@lichtenheld.com> Acked-by: Gert Doering <g...@greenie.muc.de> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1205 Message-Id: <20250924124154.15963-1-g...@greenie.muc.de> URL: https://sourceforge.net/p/openvpn/mailman/message/59238128/ Signed-off-by: Gert Doering <g...@greenie.muc.de> --- M tests/unit_tests/openvpn/test_crypto.c M tests/unit_tests/openvpn/test_ssl.c 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/tests/unit_tests/openvpn/test_crypto.c b/tests/unit_tests/openvpn/test_crypto.c index 22e6912..93dfa42 100644 --- a/tests/unit_tests/openvpn/test_crypto.c +++ b/tests/unit_tests/openvpn/test_crypto.c @@ -674,15 +674,10 @@ struct crypto_options co; }; -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - static int crypto_test_epoch_setup(void **state) { - int *num_future_keys = (int *)*state; + uint16_t *num_future_keys = (uint16_t *)*state; struct epoch_test_state *data = calloc(1, sizeof(struct epoch_test_state)); data->gc = gc_new(); @@ -699,10 +694,6 @@ return 0; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - static int crypto_test_epoch_teardown(void **state) { @@ -906,9 +897,9 @@ int main(void) { - int prestate_num13 = 13; - int prestate_num16 = 16; - int prestate_num32 = 32; + uint16_t prestate_num13 = 13; + uint16_t prestate_num16 = 16; + uint16_t prestate_num32 = 32; openvpn_unit_test_setup(); const struct CMUnitTest tests[] = { diff --git a/tests/unit_tests/openvpn/test_ssl.c b/tests/unit_tests/openvpn/test_ssl.c index ed40a7d..8dc9b66 100644 --- a/tests/unit_tests/openvpn/test_ssl.c +++ b/tests/unit_tests/openvpn/test_ssl.c @@ -133,11 +133,6 @@ const char *keyfile; } global_state; -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - static int init(void **state) { @@ -152,17 +147,16 @@ { fail_msg("make tmpfile for certificate or key data failed (error = %d)", errno); } - assert_int_equal(write(certfd, unittest_cert, strlen(unittest_cert)), strlen(unittest_cert)); - assert_int_equal(write(keyfd, unittest_key, strlen(unittest_key)), strlen(unittest_key)); + /* Awkward casts required for MinGW with -O0 only */ + assert_int_equal(write(certfd, unittest_cert, (unsigned int)strlen(unittest_cert)), + strlen(unittest_cert)); + assert_int_equal(write(keyfd, unittest_key, (unsigned int)strlen(unittest_key)), + strlen(unittest_key)); close(certfd); close(keyfd); return 0; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - static int cleanup(void **state) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1205?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Iab9e780d9649d7581e5f6aa4b23e72bbed5e145b Gerrit-Change-Number: 1205 Gerrit-PatchSet: 6 Gerrit-Owner: flichtenheld <fr...@lichtenheld.com> Gerrit-Reviewer: cron2 <g...@greenie.muc.de> Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org> Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net> Gerrit-MessageType: merged
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
