From: Nikos Mavrogiannopoulos Date: Wed, 13 Jan 2010 19:48:07 +0000 (+0100) Subject: Tests compile with --enable-gcc-warnings. X-Git-Tag: gnutls_2_9_10~164 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=830f6715779e74501bbbffe395ce7b9264f35ecc;p=thirdparty%2Fgnutls.git Tests compile with --enable-gcc-warnings. --- diff --git a/tests/chainverify.c b/tests/chainverify.c index 0407d14156..7dccea144e 100644 --- a/tests/chainverify.c +++ b/tests/chainverify.c @@ -833,7 +833,7 @@ main (int argc, char *argv[]) &verify_status); if (ret < 0) error (EXIT_FAILURE, 0, "gnutls_x509_crt_list_verify[%d,%d]: %s", - i, j, gnutls_strerror (ret)); + (int)i, (int)j, gnutls_strerror (ret)); if (verify_status != chains[i].expected_verify_result) { diff --git a/tests/crq_apis.c b/tests/crq_apis.c index 63742b228a..26ab321208 100644 --- a/tests/crq_apis.c +++ b/tests/crq_apis.c @@ -126,13 +126,13 @@ doit (void) s = 0; ret = gnutls_x509_crq_get_challenge_password (crq, NULL, &s); if (ret != 0 || s != 3) - fail ("gnutls_x509_crq_get_challenge_password2 %d/%d\n", ret, s); + fail ("gnutls_x509_crq_get_challenge_password2 %d/%d\n", ret, (int)s); s = 10; ret = gnutls_x509_crq_get_challenge_password (crq, smallbuf, &s); if (ret != 0 || s != 3 || strcmp (smallbuf, "foo") != 0) fail ("gnutls_x509_crq_get_challenge_password3 %d/%d/%s\n", - ret, s, smallbuf); + ret,(int) s, smallbuf); s = 0; ret = gnutls_x509_crq_get_extension_info (crq, 0, NULL, &s, NULL); diff --git a/tests/crq_key_id.c b/tests/crq_key_id.c index 0ba128b5a3..7658874dbd 100644 --- a/tests/crq_key_id.c +++ b/tests/crq_key_id.c @@ -159,7 +159,7 @@ doit (void) else { fail ("Key_id lengths differ incorrectly: %d - %d\n", - crq_key_id_len, pkey_key_id_len); + (int)crq_key_id_len, (int)pkey_key_id_len); } diff --git a/tests/cve-2008-4989.c b/tests/cve-2008-4989.c index fd4fb85fe7..84413a46ca 100644 --- a/tests/cve-2008-4989.c +++ b/tests/cve-2008-4989.c @@ -165,7 +165,7 @@ main (int argc, char *argv[]) { ret = gnutls_x509_crt_init (&certs[i]); if (ret < 0) - error (EXIT_FAILURE, 0, "gnutls_x509_crt_init[%d]: %s", i, + error (EXIT_FAILURE, 0, "gnutls_x509_crt_init[%d]: %s", (int)i, gnutls_strerror (ret)); tmp.data = (char *) pem_certs[i]; @@ -173,7 +173,7 @@ main (int argc, char *argv[]) ret = gnutls_x509_crt_import (certs[i], &tmp, GNUTLS_X509_FMT_PEM); if (ret < 0) - error (EXIT_FAILURE, 0, "gnutls_x509_crt_import[%d]: %s", i, + error (EXIT_FAILURE, 0, "gnutls_x509_crt_import[%d]: %s", (int)i, gnutls_strerror (ret)); } @@ -196,7 +196,7 @@ main (int argc, char *argv[]) GNUTLS_VERIFY_DISABLE_TIME_CHECKS, &verify_status); if (ret < 0) - error (EXIT_FAILURE, 0, "gnutls_x509_crt_list_verify[%d]: %s", i, + error (EXIT_FAILURE, 0, "gnutls_x509_crt_list_verify[%d]: %s", (int)i, gnutls_strerror (ret)); if (verify_status != (GNUTLS_CERT_SIGNER_NOT_FOUND | GNUTLS_CERT_INVALID)) @@ -228,7 +228,7 @@ main (int argc, char *argv[]) GNUTLS_VERIFY_DISABLE_TIME_CHECKS, &verify_status); if (ret < 0) - error (EXIT_FAILURE, 0, "gnutls_x509_crt_list_verify[%d]: %s", i, + error (EXIT_FAILURE, 0, "gnutls_x509_crt_list_verify[%d]: %s", (int)i, gnutls_strerror (ret)); if (verify_status != 0) diff --git a/tests/dn2.c b/tests/dn2.c index 5ea4fb9e11..ebe189e49e 100644 --- a/tests/dn2.c +++ b/tests/dn2.c @@ -94,7 +94,7 @@ doit (void) success ("comparison ok\n"); else fail ("comparison fail (%d/%d)\nexpect: %s\n got: %.*s\n", - out.size, strlen (info), info, out.size, out.data); + out.size, (int)strlen (info), info, out.size, out.data); gnutls_x509_crt_deinit (cert); gnutls_global_deinit (); diff --git a/tests/finished.c b/tests/finished.c index f482ef8d83..8567d470f2 100644 --- a/tests/finished.c +++ b/tests/finished.c @@ -49,7 +49,7 @@ size_t to_client_len; static ssize_t client_pull (gnutls_transport_ptr_t tr, void *data, size_t len) { - success ("client_pull len %d has %d\n", len, to_client_len); + success ("client_pull len %d has %d\n", (int)len, (int)to_client_len); if (to_client_len < len) { @@ -71,7 +71,7 @@ client_push (gnutls_transport_ptr_t tr, const void *data, size_t len) size_t newlen = to_server_len + len; char *tmp; - success ("client_push len %d has %d\n", len, to_server_len); + success ("client_push len %d has %d\n", (int)len, (int)to_server_len); hexprint (data, len); tmp = realloc (to_server, newlen); @@ -91,7 +91,7 @@ client_push (gnutls_transport_ptr_t tr, const void *data, size_t len) static ssize_t server_pull (gnutls_transport_ptr_t tr, void *data, size_t len) { - success ("server_pull len %d has %d\n", len, to_server_len); + success ("server_pull len %d has %d\n", (int)len, (int)to_server_len); if (to_server_len < len) { @@ -113,7 +113,7 @@ server_push (gnutls_transport_ptr_t tr, const void *data, size_t len) size_t newlen = to_client_len + len; char *tmp; - success ("server_push len %d has %d\n", len, to_client_len); + success ("server_push len %d has %d\n", (int)len, (int)to_client_len); hexprint (data, len); @@ -135,7 +135,7 @@ static void client_finished_callback (gnutls_session_t session, const void *finished, size_t len) { - success ("client finished (length %d)\n", len); + success ("client finished (length %d)\n", (int)len); hexprint (finished, len); } @@ -143,7 +143,7 @@ static void server_finished_callback (gnutls_session_t session, const void *finished, size_t len) { - success ("server finished (length %d)\n", len); + success ("server finished (length %d)\n", (int)len); hexprint (finished, len); } @@ -220,7 +220,7 @@ doit (void) success ("Handshake established\n"); ns = gnutls_record_send (client, MSG, strlen (MSG)); - success ("client: sent %d\n", ns); + success ("client: sent %d\n", (int)ns); ret = gnutls_record_recv (server, buffer, MAX_BUF); if (ret == 0) @@ -236,7 +236,7 @@ doit (void) } ns = gnutls_record_send (server, MSG, strlen (MSG)); - success ("server: sent %d\n", ns); + success ("server: sent %d\n", (int)ns); ret = gnutls_record_recv (client, buffer, MAX_BUF); if (ret == 0) diff --git a/tests/mini.c b/tests/mini.c index 21a426ee7e..e1da277632 100644 --- a/tests/mini.c +++ b/tests/mini.c @@ -47,7 +47,7 @@ size_t to_client_len; static ssize_t client_pull (gnutls_transport_ptr_t tr, void *data, size_t len) { - success ("client_pull len %d has %d\n", len, to_client_len); + success ("client_pull len %d has %d\n", (int)len, (int)to_client_len); if (to_client_len < len) { @@ -69,7 +69,7 @@ client_push (gnutls_transport_ptr_t tr, const void *data, size_t len) size_t newlen = to_server_len + len; char *tmp; - success ("client_push len %d has %d\n", len, to_server_len); + success ("client_push len %d has %d\n", (int)len, (int)to_server_len); hexprint (data, len); tmp = realloc (to_server, newlen); @@ -89,7 +89,7 @@ client_push (gnutls_transport_ptr_t tr, const void *data, size_t len) static ssize_t server_pull (gnutls_transport_ptr_t tr, void *data, size_t len) { - success ("server_pull len %d has %d\n", len, to_server_len); + success ("server_pull len %d has %d\n", (int)len, (int)to_server_len); if (to_server_len < len) { @@ -111,7 +111,7 @@ server_push (gnutls_transport_ptr_t tr, const void *data, size_t len) size_t newlen = to_client_len + len; char *tmp; - success ("server_push len %d has %d\n", len, to_client_len); + success ("server_push len %d has %d\n", (int)len, (int)to_client_len); hexprint (data, len); @@ -200,7 +200,7 @@ doit (void) success ("Handshake established\n"); ns = gnutls_record_send (client, MSG, strlen (MSG)); - success ("client: sent %d\n", ns); + success ("client: sent %d\n", (int)ns); ret = gnutls_record_recv (server, buffer, MAX_BUF); if (ret == 0) @@ -216,7 +216,7 @@ doit (void) } ns = gnutls_record_send (server, MSG, strlen (MSG)); - success ("server: sent %d\n", ns); + success ("server: sent %d\n", (int)ns); ret = gnutls_record_recv (client, buffer, MAX_BUF); if (ret == 0) diff --git a/tests/pkcs12_s2k_pem.c b/tests/pkcs12_s2k_pem.c index 7298e19685..9db3842162 100644 --- a/tests/pkcs12_s2k_pem.c +++ b/tests/pkcs12_s2k_pem.c @@ -284,7 +284,7 @@ main (void) keys[i].password, 0); if (ret != keys[i].expected_result) { - printf ("fail[%d]: %d: %s\n", i, ret, gnutls_strerror (ret)); + printf ("fail[%d]: %d: %s\n", (int)i, ret, gnutls_strerror (ret)); return 1; } diff --git a/tests/tlsia.c b/tests/tlsia.c index cc1dbce345..b2f684154a 100644 --- a/tests/tlsia.c +++ b/tests/tlsia.c @@ -59,7 +59,7 @@ client_avp (gnutls_session_t session, void *ptr, if (last) printf ("client: received %d bytes AVP: `%.*s'\n", - lastlen, (int) lastlen, last); + (int)lastlen, (int) lastlen, last); else printf ("client: new application phase\n"); @@ -93,7 +93,7 @@ client_avp (gnutls_session_t session, void *ptr, return -1; *newlen = strlen (*new); - printf ("client: sending %d bytes AVP: `%s'\n", *newlen, *new); + printf ("client: sending %d bytes AVP: `%s'\n", (int)*newlen, *new); gnutls_ia_permute_inner_secret (session, 3, "foo"); @@ -291,7 +291,7 @@ server_avp (gnutls_session_t session, void *ptr, if (last) printf ("server: received %d bytes AVP: `%.*s'\n", - lastlen, (int) lastlen, last); + (int)lastlen, (int) lastlen, last); gnutls_ia_permute_inner_secret (session, 3, "foo"); @@ -355,7 +355,7 @@ server_avp (gnutls_session_t session, void *ptr, return -1; *newlen = strlen (*new); - printf ("server: sending %d bytes AVP: `%s'\n", *newlen, *new); + printf ("server: sending %d bytes AVP: `%s'\n", (int)*newlen, *new); return 0; } diff --git a/tests/x509sign-verify.c b/tests/x509sign-verify.c index 532114f297..c844c35429 100644 --- a/tests/x509sign-verify.c +++ b/tests/x509sign-verify.c @@ -147,7 +147,7 @@ doit (void) for (i = 0; i < sizeof (key_dat) / sizeof (key_dat[0]); i++) { - success ("loop %d\n", i); + success ("loop %d\n", (int)i); ret = gnutls_x509_privkey_init (&key); if (ret < 0)