From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 4 Aug 2012 20:12:48 +0000 (+0200)
Subject: documentation fixes.
X-Git-Tag: gnutls_3_1_0pre0~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=458d80a1c4f31b4aa27da2c3e3202167dffc2e90;p=thirdparty%2Fgnutls.git

documentation fixes.
---

diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 01636cc353..9be2f03c3b 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -776,7 +776,7 @@ gnutls_certificate_activation_time_peers (gnutls_session_t session)
     }
 }
 
-/*-
+/**
  * gnutls_sign_callback_set:
  * @session: is a gnutls session
  * @sign_func: function pointer to application's sign callback.
@@ -796,7 +796,7 @@ gnutls_certificate_activation_time_peers (gnutls_session_t session)
  * callback function.  See also gnutls_sign_callback_get().
  *
  * Deprecated: Use the PKCS 11 or #gnutls_privkey_t interfacess like gnutls_privkey_import_ext() instead.
- -*/
+ **/
 void
 gnutls_sign_callback_set (gnutls_session_t session,
                           gnutls_sign_func sign_func, void *userdata)
@@ -805,7 +805,7 @@ gnutls_sign_callback_set (gnutls_session_t session,
   session->internals.sign_func_userdata = userdata;
 }
 
-/*-
+/**
  * gnutls_sign_callback_get:
  * @session: is a gnutls session
  * @userdata: if non-%NULL, will be set to abstract callback pointer.
@@ -816,7 +816,7 @@ gnutls_sign_callback_set (gnutls_session_t session,
  *   if not set, %NULL.
  *
  * Deprecated: Use the PKCS 11 interfaces instead.
- -*/
+ **/
 gnutls_sign_func
 gnutls_sign_callback_get (gnutls_session_t session, void **userdata)
 {
diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c
index 5cfb6dfd9d..5adee3cbdf 100644
--- a/lib/pkcs11_privkey.c
+++ b/lib/pkcs11_privkey.c
@@ -638,7 +638,7 @@ cleanup:
 
 /**
  * gnutls_pkcs11_privkey_set_pin_function:
- * @obj: The object structure
+ * @key: The private key
  * @fn: the callback
  * @userdata: data associated with the callback
  *
diff --git a/lib/tpm.c b/lib/tpm.c
index 564c0acdae..47f0466a18 100644
--- a/lib/tpm.c
+++ b/lib/tpm.c
@@ -562,6 +562,7 @@ out_ctx:
  * @format: The format of the private key
  * @srk_password: The password for the SRK key (optional)
  * @key_password: A password for the key (optional)
+ * @flags: should be zero
  *
  * This function will import the given private key to the abstract
  * #gnutls_privkey_t structure.