Fix GTK-DOC warnings.

2 files changed, 27 insertions, 28 deletions

diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index 5b12f258e2..de0da6785d 100644
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -634,10 +634,10 @@ int gnutls_srp_base64_decode_alloc( const gnutls_datum_t *b64_data,
    */
 
   gnutls_credentials_type_t gnutls_auth_get_type(gnutls_session_t session);
-  gnutls_credentials_type_t gnutls_auth_server_get_type(gnutls_session_t
-							session);
-  gnutls_credentials_type_t gnutls_auth_client_get_type(gnutls_session_t
-							session);
+  gnutls_credentials_type_t
+  gnutls_auth_server_get_type(gnutls_session_t session);
+  gnutls_credentials_type_t
+  gnutls_auth_client_get_type(gnutls_session_t session);
 
   /* DH */
 
@@ -669,16 +669,15 @@ int gnutls_srp_base64_decode_alloc( const gnutls_datum_t *b64_data,
    gnutls_certificate_server_retrieve_function * func);
 
   void gnutls_certificate_server_set_request(gnutls_session_t session,
-					     gnutls_certificate_request_t
-					     req);
+					     gnutls_certificate_request_t req);
 
   /* get data from the session
    */
-  const gnutls_datum_t *gnutls_certificate_get_peers(gnutls_session_t
-						     session, unsigned int
-						     *list_size);
-  const gnutls_datum_t *gnutls_certificate_get_ours(gnutls_session_t
-						    session);
+  const gnutls_datum_t *
+  gnutls_certificate_get_peers(gnutls_session_t session,
+			       unsigned int *list_size);
+  const gnutls_datum_t *
+  gnutls_certificate_get_ours(gnutls_session_t session);
 
   time_t gnutls_certificate_activation_time_peers(gnutls_session_t session);
   time_t gnutls_certificate_expiration_time_peers(gnutls_session_t session);
@@ -732,8 +731,8 @@ int gnutls_srp_base64_decode_alloc( const gnutls_datum_t *b64_data,
 				     gnutls_params_st *);
 
   void
-  gnutls_certificate_set_params_function(gnutls_certificate_credentials_t
-					 res, gnutls_params_function * func);
+  gnutls_certificate_set_params_function(gnutls_certificate_credentials_t res,
+					 gnutls_params_function * func);
   void gnutls_anon_set_params_function(gnutls_anon_server_credentials_t res,
 				       gnutls_params_function * func);
 
diff --git a/includes/gnutls/openpgp.h b/includes/gnutls/openpgp.h
index 87d38faa4f..7f31de617e 100644
--- a/includes/gnutls/openpgp.h
+++ b/includes/gnutls/openpgp.h
@@ -62,7 +62,7 @@ int gnutls_openpgp_key_get_name( gnutls_openpgp_key_t key,
     int idx, char *buf, size_t *sizeof_buf);
 
 int gnutls_openpgp_key_get_pk_algorithm(gnutls_openpgp_key_t key,
-                                            unsigned int *r_bits);
+                                            unsigned int *bits);
 
 int gnutls_openpgp_key_get_version( gnutls_openpgp_key_t key );
 
@@ -90,10 +90,10 @@ int gnutls_openpgp_privkey_import(gnutls_openpgp_privkey_t key,
 struct gnutls_openpgp_keyring_int; /* object to hold (parsed) openpgp keyrings */
 typedef struct gnutls_openpgp_keyring_int* gnutls_openpgp_keyring;
 
-int gnutls_openpgp_keyring_init( gnutls_openpgp_keyring* ring);
-void gnutls_openpgp_keyring_deinit(gnutls_openpgp_keyring_t ring);
+int gnutls_openpgp_keyring_init( gnutls_openpgp_keyring* keyring);
+void gnutls_openpgp_keyring_deinit(gnutls_openpgp_keyring_t keyring);
 
-int gnutls_openpgp_keyring_import(gnutls_openpgp_keyring_t ring,
+int gnutls_openpgp_keyring_import(gnutls_openpgp_keyring_t keyring,
     const gnutls_datum_t* data, gnutls_openpgp_key_fmt format);
 
 int gnutls_openpgp_keyring_check_id( gnutls_openpgp_keyring_t ring,
@@ -104,25 +104,25 @@ int gnutls_openpgp_keyring_check_id( gnutls_openpgp_keyring_t ring,
 struct gnutls_openpgp_trustdb_int; /* object to hold (parsed) openpgp trustdbs */
 typedef struct gnutls_openpgp_trustdb_int* gnutls_openpgp_trustdb;
 
-int gnutls_openpgp_trustdb_init( gnutls_openpgp_trustdb* db);
-void gnutls_openpgp_trustdb_deinit(gnutls_openpgp_trustdb_t db);
+int gnutls_openpgp_trustdb_init( gnutls_openpgp_trustdb* trustdb);
+void gnutls_openpgp_trustdb_deinit(gnutls_openpgp_trustdb_t trustdb);
 
-int gnutls_openpgp_trustdb_import(gnutls_openpgp_trustdb_t db,
-    const char* file);
+int gnutls_openpgp_trustdb_import(gnutls_openpgp_trustdb_t trustdb,
+				  const char* file);
 
 
-int gnutls_openpgp_key_verify_ring( 
-    gnutls_openpgp_key_t key, 
-    gnutls_openpgp_keyring_t ring,
+int gnutls_openpgp_key_verify_ring(
+    gnutls_openpgp_key_t key,
+    gnutls_openpgp_keyring_t keyring,
     unsigned int flags,
     unsigned int * verify /* the output of the verification */);
 
 int gnutls_openpgp_key_verify_self( gnutls_openpgp_key_t key,
-        unsigned int flags, unsigned int *verify);
+				    unsigned int flags, unsigned int *verify);
 
-int gnutls_openpgp_key_verify_trustdb( 
-    gnutls_openpgp_key_t key, 
-    gnutls_openpgp_trustdb_t db,
+int gnutls_openpgp_key_verify_trustdb(
+    gnutls_openpgp_key_t key,
+    gnutls_openpgp_trustdb_t trustdb,
     unsigned int flags,
     unsigned int * verify /* the output of the verification */);