diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-06-09 10:38:38 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-08-01 18:09:12 +0200 |
| commit | 48392b2f88ac03e87df2dc376faa4376359b39f4 (patch) | |
| tree | f984f27fdcf204b7e74409dc8f19be6921e24f0b | |
| parent | ff80f1ae165bdb30979da036c68b94f9c4a097d1 (diff) | |
| download | gnutls-48392b2f88ac03e87df2dc376faa4376359b39f4.tar.gz | |
Fix up compiler warnings.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
| -rw-r--r-- | lib/pkcs11.c | 6 | ||||
| -rw-r--r-- | src/cli.c | 3 | ||||
| -rw-r--r-- | src/p11common.c | 3 | ||||
| -rw-r--r-- | src/pkcs11.c | 4 | ||||
| -rw-r--r-- | tests/suite/mini-eagain2.c | 2 |
5 files changed, 6 insertions, 12 deletions
diff --git a/lib/pkcs11.c b/lib/pkcs11.c index d3c3d63c34..8242162b6c 100644 --- a/lib/pkcs11.c +++ b/lib/pkcs11.c @@ -309,8 +309,8 @@ pkcs11_get_info (struct p11_kit_uri *info, size_t str_max = 0; int terminate = 0; int hexify = 0; - size_t length; - const char *data; + size_t length = 0; + const char *data = NULL; char buf[32]; /* @@ -382,8 +382,6 @@ pkcs11_get_info (struct p11_kit_uri *info, (int)version->minor); terminate = 1; } - else - return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST); /* data and len are uninitialized */ if (hexify) { @@ -1168,11 +1168,10 @@ psk_callback (gnutls_session_t session, char **username, gnutls_datum_t * key) { char *tmp = NULL; size_t n; - ssize_t len; printf ("Enter PSK identity: "); fflush (stdout); - len = getline (&tmp, &n, stdin); + getline (&tmp, &n, stdin); if (tmp == NULL) { diff --git a/src/p11common.c b/src/p11common.c index 0060c88eb6..1ef7c9c538 100644 --- a/src/p11common.c +++ b/src/p11common.c @@ -102,7 +102,6 @@ static int token_callback (void *user, const char *label, const unsigned retry) { char buf[32]; - char *p; if (retry > 0) { @@ -110,7 +109,7 @@ token_callback (void *user, const char *label, const unsigned retry) return -1; } printf ("Please insert token '%s' in slot and press enter\n", label); - p = fgets (buf, sizeof (buf), stdin); + fgets (buf, sizeof (buf), stdin); return 0; } diff --git a/src/pkcs11.c b/src/pkcs11.c index 20a076f10d..cd42c6cf0e 100644 --- a/src/pkcs11.c +++ b/src/pkcs11.c @@ -799,13 +799,9 @@ pkcs11_mechanism_list (FILE * outfile, const char *url, unsigned int login, { int ret; int idx; - unsigned int obj_flags = 0; unsigned long mechanism; const char *str; - if (login) - obj_flags = GNUTLS_PKCS11_OBJ_FLAG_LOGIN; - pkcs11_common (); if (url == NULL) diff --git a/tests/suite/mini-eagain2.c b/tests/suite/mini-eagain2.c index 284fdc9aee..59a096b9c3 100644 --- a/tests/suite/mini-eagain2.c +++ b/tests/suite/mini-eagain2.c @@ -21,11 +21,13 @@ static int done = 0; +#if 0 static void tls_log_func (int level, const char *str) { fprintf(stderr, "|<%d>| %s", level, str); } +#endif static const char* SSL_GNUTLS_PRINT_HANDSHAKE_STATUS(gnutls_handshake_description_t status) |