Doc fixes for GTK-DOC.

3 files changed, 41 insertions, 37 deletions

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 8bbb50422e..83deaee5ae 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -1684,36 +1684,40 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
   struct gnutls_tdb_int;
   typedef struct gnutls_tdb_int *gnutls_tdb_t;
   
-  int gnutls_tdb_init(gnutls_tdb_t*);
-  void gnutls_tdb_set_store_func(gnutls_tdb_t, gnutls_tdb_store_func);
-  void gnutls_tdb_set_store_commitment_func(gnutls_tdb_t, gnutls_tdb_store_commitment_func);
-  void gnutls_tdb_set_verify_func(gnutls_tdb_t, gnutls_tdb_verify_func);
-  void gnutls_tdb_deinit(gnutls_tdb_t);
-
-  int gnutls_verify_stored_pubkey(const char* db_name, 
-                            gnutls_tdb_t,
-                            const char* host,
-                            const char* service,
-                            gnutls_certificate_type_t cert_type,
-                            const gnutls_datum_t * cert, unsigned int flags);
-
-  int gnutls_store_commitment(const char* db_name,
-                    gnutls_tdb_t,
-                    const char* host,
-                    const char* service,
-                    gnutls_digest_algorithm_t hash_algo,
-                    const gnutls_datum_t* hash,
-                    time_t expiration,
-                    unsigned int flags);
-
-  int gnutls_store_pubkey(const char* db_name,
-                    gnutls_tdb_t,
-                    const char* host,
-                    const char* service,
-                    gnutls_certificate_type_t cert_type,
-                    const gnutls_datum_t * cert, 
-                    time_t expiration,
-                    unsigned int flags);
+  int gnutls_tdb_init (gnutls_tdb_t *tdb);
+  void gnutls_tdb_set_store_func (gnutls_tdb_t tdb,
+				  gnutls_tdb_store_func store);
+  void gnutls_tdb_set_store_commitment_func (gnutls_tdb_t tdb,
+				     gnutls_tdb_store_commitment_func cstore);
+  void gnutls_tdb_set_verify_func (gnutls_tdb_t tdb,
+				   gnutls_tdb_verify_func verify);
+  void gnutls_tdb_deinit (gnutls_tdb_t tdb);
+
+  int gnutls_verify_stored_pubkey (const char* db_name,
+				   gnutls_tdb_t tdb,
+				   const char* host,
+				   const char* service,
+				   gnutls_certificate_type_t cert_type,
+				   const gnutls_datum_t * cert,
+				   unsigned int flags);
+
+  int gnutls_store_commitment (const char* db_name,
+			       gnutls_tdb_t tdb,
+			       const char* host,
+			       const char* service,
+			       gnutls_digest_algorithm_t hash_algo,
+			       const gnutls_datum_t* hash,
+			       time_t expiration,
+			       unsigned int flags);
+
+  int gnutls_store_pubkey (const char* db_name,
+			   gnutls_tdb_t tdb,
+			   const char* host,
+			   const char* service,
+			   gnutls_certificate_type_t cert_type,
+			   const gnutls_datum_t * cert,
+			   time_t expiration,
+			   unsigned int flags);
 
 
   /* Gnutls error codes. The mapping to a TLS alert is also shown in
diff --git a/lib/includes/gnutls/ocsp.h b/lib/includes/gnutls/ocsp.h
index 3c125569cc..db16b70c10 100644
--- a/lib/includes/gnutls/ocsp.h
+++ b/lib/includes/gnutls/ocsp.h
@@ -241,12 +241,12 @@ extern "C"
 				  size_t *ncerts);
 
   int gnutls_ocsp_resp_verify_direct (gnutls_ocsp_resp_t resp,
-				      gnutls_x509_crt_t signercert,
-				      unsigned int*verify,
+				      gnutls_x509_crt_t issuer,
+				      unsigned int *verify,
 				      unsigned int flags);
   int gnutls_ocsp_resp_verify (gnutls_ocsp_resp_t resp,
 			       gnutls_x509_trust_list_t trustlist,
-			       unsigned int*verify,
+			       unsigned int *verify,
 			       unsigned int flags);
 
 #ifdef __cplusplus
diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c
index 7304cb76c8..b2a34af2bf 100644
--- a/lib/verify-tofu.c
+++ b/lib/verify-tofu.c
@@ -105,7 +105,7 @@ struct gnutls_tdb_int default_tdb = {
  * Since: 3.0
  **/
 int
-gnutls_verify_stored_pubkey(const char* db_name, 
+gnutls_verify_stored_pubkey(const char* db_name,
                             gnutls_tdb_t tdb,
                             const char* host,
                             const char* service,
@@ -599,12 +599,12 @@ char buffer[MAX_HASH_SIZE*2+1];
  * Since: 3.0
  **/
 int
-gnutls_store_pubkey(const char* db_name, 
+gnutls_store_pubkey(const char* db_name,
                     gnutls_tdb_t tdb,
                     const char* host,
                     const char* service,
                     gnutls_certificate_type_t cert_type,
-                    const gnutls_datum_t * cert, 
+                    const gnutls_datum_t * cert,
                     time_t expiration,
                     unsigned int flags)
 {
@@ -684,7 +684,7 @@ cleanup:
  * Since: 3.0
  **/
 int
-gnutls_store_commitment(const char* db_name, 
+gnutls_store_commitment(const char* db_name,
                     gnutls_tdb_t tdb,
                     const char* host,
                     const char* service,