diff options
author | Tim Rühsen <tim.ruehsen@gmx.de> | 2018-05-24 09:49:34 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-05-26 18:35:37 +0000 |
commit | 0f5d76ad336e3044c850b625df3af987625844ae (patch) | |
tree | 9dd204937ba95958619239b72570dc5387313364 | |
parent | 76e5e8708cf045b9a79d413f97b3eb93710c5c44 (diff) | |
download | gnutls-0f5d76ad336e3044c850b625df3af987625844ae.tar.gz |
Fix warnings in test suite
Fixes:
tls-ext-register.c:238:11: warning: unused variable 'i' [-Wunused-variable]
record-retvals.c:118:14: warning: unused variable 'vers' [-Wunused-variable]
record-retvals.c:347:1: warning: label 'next' defined but not used [-Wunused-label]
alerts.c:71:14: warning: unused variable 'vers' [-Wunused-variable]
alerts.c:71:11: warning: unused variable 'i' [-Wunused-variable]
alerts.c:160:11: warning: unused variable 'i' [-Wunused-variable]
send-client-cert.c:176:6: warning: no previous prototype for 'start' [-Wmissing-prototypes]
tls-session-supplemental.c:186:6: warning: unused variable 'optval' [-Wunused-variable]
tls-session-supplemental.c:184:7: warning: unused variable 'topbuf' [-Wunused-variable]
tls-session-supplemental.c:183:6: warning: unused variable 'err' [-Wunused-variable]
x509self.c:211:6: warning: unused variable 'optval' [-Wunused-variable]
x509self.c:208:7: warning: unused variable 'topbuf' [-Wunused-variable]
x509self.c:207:6: warning: unused variable 'err' [-Wunused-variable]
Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
-rw-r--r-- | tests/alerts.c | 6 | ||||
-rw-r--r-- | tests/record-retvals.c | 3 | ||||
-rw-r--r-- | tests/send-client-cert.c | 4 | ||||
-rw-r--r-- | tests/tls-ext-register.c | 3 | ||||
-rw-r--r-- | tests/tls-session-supplemental.c | 6 | ||||
-rw-r--r-- | tests/x509self.c | 4 |
6 files changed, 9 insertions, 17 deletions
diff --git a/tests/alerts.c b/tests/alerts.c index 03f5738bd2..dc17c6b7ab 100644 --- a/tests/alerts.c +++ b/tests/alerts.c @@ -68,7 +68,6 @@ static void client_log_func(int level, const char *str) static void client(int fd, const char *prio, int ign) { int ret; - unsigned i, vers; char buffer[64]; const char* err; gnutls_certificate_credentials_t x509_cred; @@ -157,7 +156,6 @@ static void terminate(void) static void server(int fd, const char *prio, int ign) { int ret; - unsigned i; const char* err; char buffer[64]; gnutls_session_t session; @@ -225,7 +223,7 @@ static void server(int fd, const char *prio, int ign) if (ret != GNUTLS_E_WARNING_ALERT_RECEIVED || gnutls_alert_get(session) != GNUTLS_A_USER_CANCELED) { fail("client: Error: %s\n", gnutls_strerror(ret)); - } + } do { do { @@ -239,7 +237,7 @@ static void server(int fd, const char *prio, int ign) if (ret != GNUTLS_E_FATAL_ALERT_RECEIVED || gnutls_alert_get(session) != GNUTLS_A_DECRYPT_ERROR) { fail("client: Error: %s\n", gnutls_strerror(ret)); - } + } close(fd); gnutls_deinit(session); diff --git a/tests/record-retvals.c b/tests/record-retvals.c index b3166607f9..84328b9652 100644 --- a/tests/record-retvals.c +++ b/tests/record-retvals.c @@ -115,7 +115,7 @@ const gnutls_datum_t server_key = { server_key_pem, static void client(int fd, const char *prio, int ign) { int ret; - unsigned i, vers; + unsigned i; char buffer[MAX_BUF + 1]; const char* err; gnutls_anon_client_credentials_t anoncred; @@ -344,7 +344,6 @@ static void server(int fd, const char *prio, int ign) i++; } while (ret > 0); -next: if (ret < 0) { fail("client: Error: %s\n", gnutls_strerror(ret)); exit(1); diff --git a/tests/send-client-cert.c b/tests/send-client-cert.c index 90809ba6cc..34f8f0bd93 100644 --- a/tests/send-client-cert.c +++ b/tests/send-client-cert.c @@ -117,7 +117,7 @@ static void try(const char *prio, unsigned expect, unsigned ca_type) if (ret < 0) exit(1); - ret = gnutls_certificate_set_x509_key_mem(clientx509cred, + ret = gnutls_certificate_set_x509_key_mem(clientx509cred, &cli_ca3_cert_chain, &cli_ca3_key, GNUTLS_X509_FMT_PEM); if (ret < 0) @@ -173,7 +173,7 @@ static void try(const char *prio, unsigned expect, unsigned ca_type) gnutls_dh_params_deinit(dh_params); } -void start(const char *prio) +static void start(const char *prio) { global_init(); diff --git a/tests/tls-ext-register.c b/tests/tls-ext-register.c index 15113a3e91..1eee470856 100644 --- a/tests/tls-ext-register.c +++ b/tests/tls-ext-register.c @@ -70,7 +70,7 @@ static int TLSEXT_TYPE_server_sent = 0; static int TLSEXT_TYPE_server_received = 0; static const unsigned char ext_data[] = -{ +{ 0xFE, 0xED }; @@ -235,7 +235,6 @@ static void server(int sd, const char *prio) gnutls_certificate_credentials_t serverx509cred; int ret; gnutls_session_t session; - unsigned i; /* this must be called once in the program */ diff --git a/tests/tls-session-supplemental.c b/tests/tls-session-supplemental.c index b7421c3925..36f99102aa 100644 --- a/tests/tls-session-supplemental.c +++ b/tests/tls-session-supplemental.c @@ -67,7 +67,7 @@ static int TLS_SUPPLEMENTALDATA_server_sent = 0; static int TLS_SUPPLEMENTALDATA_server_received = 0; static const unsigned char supp_data[] = -{ +{ 0xFE, 0xED }; @@ -180,10 +180,8 @@ end: static void server(int sd, const char *prio) { - int err, ret; - char topbuf[512]; + int ret; gnutls_session_t session; - int optval = 1; gnutls_certificate_credentials_t serverx509cred; /* this must be called once in the program diff --git a/tests/x509self.c b/tests/x509self.c index f1c674a8e5..b22dfea2b9 100644 --- a/tests/x509self.c +++ b/tests/x509self.c @@ -204,11 +204,9 @@ static void client(int sd, const char *prio) static void server(int sd, const char *prio) { - int err, ret; - char topbuf[512]; + int ret; gnutls_session_t session; char buffer[MAX_BUF + 1]; - int optval = 1; gnutls_certificate_credentials_t x509_cred; global_init(); |