diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gnutls_anon_cred.c | 8 | ||||
| -rw-r--r-- | lib/gnutls_buffers.c | 3 | ||||
| -rw-r--r-- | lib/opencdk/keydb.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/gnutls_anon_cred.c b/lib/gnutls_anon_cred.c index f778d6ca04..537037a1c0 100644 --- a/lib/gnutls_anon_cred.c +++ b/lib/gnutls_anon_cred.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001, 2004, 2005, 2007 Free Software Foundation + * Copyright (C) 2001, 2004, 2005, 2007, 2008 Free Software Foundation * * Author: Nikos Mavrogiannopoulos * @@ -33,8 +33,6 @@ #include "gnutls_num.h" #include "gnutls_mpi.h" -static const int anon_dummy; - /** * gnutls_anon_free_server_credentials - Used to free an allocated gnutls_anon_server_credentials_t structure * @sc: is an #gnutls_anon_server_credentials_t structure. @@ -81,6 +79,8 @@ gnutls_anon_free_client_credentials (gnutls_anon_client_credentials_t sc) { } +static const gnutls_anon_client_credentials_t anon_dummy; + /** * gnutls_anon_allocate_client_credentials - Used to allocate a credentials structure * @sc: is a pointer to an #gnutls_anon_client_credentials_t structure. @@ -97,7 +97,7 @@ gnutls_anon_allocate_client_credentials (gnutls_anon_client_credentials_t * /* anon_dummy is only there for *sc not to be null. * it is not used at all; */ - *sc = (void *) &anon_dummy; + *sc = anon_dummy; return 0; } diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c index f0b8e61e4c..06fbaf1753 100644 --- a/lib/gnutls_buffers.c +++ b/lib/gnutls_buffers.c @@ -861,7 +861,8 @@ _gnutls_io_write_buffered (gnutls_session_t session, { if (sum < n - left) { - sprintf (tmp, "%.2x ", ((unsigned char *) ptr)[sum++]); + sprintf (tmp, "%.2x ", + ((const unsigned char *) ptr)[sum++]); _gnutls_str_cat (line, sizeof (line), tmp); } else diff --git a/lib/opencdk/keydb.c b/lib/opencdk/keydb.c index 66f8b1be39..423a415072 100644 --- a/lib/opencdk/keydb.c +++ b/lib/opencdk/keydb.c @@ -1680,7 +1680,7 @@ keydb_parse_allsigs (cdk_kbnode_t knode, cdk_keydb_hd_t hd, int check) return 0; } -void +static void add_key_usage (cdk_kbnode_t knode, u32 keyid[2], unsigned int usage) { cdk_kbnode_t p, ctx; |