>From c68258d60c35426a89081705874b6d2acbba0ed9 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Mon, 1 Aug 2011 09:45:44 +0200 Subject: [PATCH 1/3] Mark the config argument of gnutls_pkcs11_init() as unused * Since its no longer used. --- lib/includes/gnutls/pkcs11.h | 2 +- lib/pkcs11.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h index 647b241..4206749 100644 --- a/lib/includes/gnutls/pkcs11.h +++ b/lib/includes/gnutls/pkcs11.h @@ -57,7 +57,7 @@ typedef struct gnutls_pkcs11_obj_st *gnutls_pkcs11_obj_t; * load = /lib/yyy-pkcs11.so */ -int gnutls_pkcs11_init (unsigned int flags, const char *configfile); +int gnutls_pkcs11_init (unsigned int flags, void *unused); void gnutls_pkcs11_deinit (void); void gnutls_pkcs11_set_token_function (gnutls_pkcs11_token_callback_t fn, void *userdata); diff --git a/lib/pkcs11.c b/lib/pkcs11.c index 7366965..bbf6d4b 100644 --- a/lib/pkcs11.c +++ b/lib/pkcs11.c @@ -464,10 +464,10 @@ const char* configfile = "/etc/gnutls/pkcs11.conf"; /** * gnutls_pkcs11_init: * @flags: %GNUTLS_PKCS11_FLAG_MANUAL or %GNUTLS_PKCS11_FLAG_AUTO - * @configfile: either NULL or the location of a configuration file + * @unused: unused, set to NULL * * This function will initialize the PKCS 11 subsystem in gnutls. It will - * read a configuration file if %GNUTLS_PKCS11_FLAG_AUTO is used or allow + * read configuration files if %GNUTLS_PKCS11_FLAG_AUTO is used or allow * you to independently load PKCS 11 modules using gnutls_pkcs11_add_provider() * if %GNUTLS_PKCS11_FLAG_MANUAL is specified. * @@ -479,7 +479,7 @@ const char* configfile = "/etc/gnutls/pkcs11.conf"; * negative error value. **/ int -gnutls_pkcs11_init (unsigned int flags, const char *configfile) +gnutls_pkcs11_init (unsigned int flags, void *unused) { struct ck_function_list **modules; const char *name; -- 1.7.6