Fix gtk-doc warnings.

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 46ef7229596ab979b94f5c091b8640a58d67cbf9..ed7c6f34b8eab8523ea2520c21e3f88bfd06ba6c 100644 (file)
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -1,5 +1,5 @@
 /* -*- c -*-
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Nikos Mavroyanopoulos
  *
@@ -691,24 +691,21 @@ extern "C" {
                                         gnutls_dh_params_t dh_params);
 
   void
-    gnutls_anon_set_server_params_function (gnutls_anon_server_credentials_t
-                                           res,
-                                           gnutls_params_function * func);
+  gnutls_anon_set_server_params_function (gnutls_anon_server_credentials_t res,
+                                         gnutls_params_function * func);
 
-  void gnutls_anon_free_client_credentials (gnutls_anon_client_credentials_t
-                                           sc);
+  void
+  gnutls_anon_free_client_credentials (gnutls_anon_client_credentials_t sc);
   int
-    gnutls_anon_allocate_client_credentials (gnutls_anon_client_credentials_t
-                                            * sc);
+  gnutls_anon_allocate_client_credentials (gnutls_anon_client_credentials_t * sc);
 
 /* CERTFILE is an x509 certificate in PEM form.
  * KEYFILE is a pkcs-1 private key in PEM form (for RSA keys).
  */
-  void gnutls_certificate_free_credentials (gnutls_certificate_credentials_t
-                                           sc);
+  void
+  gnutls_certificate_free_credentials (gnutls_certificate_credentials_t sc);
   int
-    gnutls_certificate_allocate_credentials (gnutls_certificate_credentials_t
-                                            * res);
+  gnutls_certificate_allocate_credentials (gnutls_certificate_credentials_t *res);
 
   void gnutls_certificate_free_keys (gnutls_certificate_credentials_t sc);
   void gnutls_certificate_free_cas (gnutls_certificate_credentials_t sc);

diff --git a/lib/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h
index 316a12ee242be5c41635aa614f412ac2be72faa5..800a00e315437486c5b38b7a6ee88ce4a6f0583b 100644 (file)
--- a/lib/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
@@ -196,14 +196,14 @@ extern "C"
                                                     key, unsigned int idx);
 
   int gnutls_openpgp_privkey_export_subkey_dsa_raw (gnutls_openpgp_privkey_t
-                                                   crt, unsigned int idx,
+                                                   pkey, unsigned int idx,
                                                    gnutls_datum_t * p,
                                                    gnutls_datum_t * q,
                                                    gnutls_datum_t * g,
                                                    gnutls_datum_t * y,
                                                    gnutls_datum_t * x);
   int gnutls_openpgp_privkey_export_subkey_rsa_raw (gnutls_openpgp_privkey_t
-                                                   crt, unsigned int idx,
+                                                   pkey, unsigned int idx,
                                                    gnutls_datum_t * m,
                                                    gnutls_datum_t * e,
                                                    gnutls_datum_t * d,
@@ -211,13 +211,13 @@ extern "C"
                                                    gnutls_datum_t * q,
                                                    gnutls_datum_t * u);
 
-  int gnutls_openpgp_privkey_export_dsa_raw (gnutls_openpgp_privkey_t crt,
+  int gnutls_openpgp_privkey_export_dsa_raw (gnutls_openpgp_privkey_t pkey,
                                             gnutls_datum_t * p,
                                             gnutls_datum_t * q,
                                             gnutls_datum_t * g,
                                             gnutls_datum_t * y,
                                             gnutls_datum_t * x);
-  int gnutls_openpgp_privkey_export_rsa_raw (gnutls_openpgp_privkey_t crt,
+  int gnutls_openpgp_privkey_export_rsa_raw (gnutls_openpgp_privkey_t pkey,
                                             gnutls_datum_t * m,
                                             gnutls_datum_t * e,
                                             gnutls_datum_t * d,
@@ -324,13 +324,13 @@ extern "C"
                                              res, const char *CERTFILE,
                                              const char *KEYFILE,
                                              const char *keyid,
-                                             gnutls_openpgp_crt_fmt_t);
+                                             gnutls_openpgp_crt_fmt_t format);
   int
     gnutls_certificate_set_openpgp_key_mem2 (gnutls_certificate_credentials_t
                                             res, const gnutls_datum_t * CERT,
                                             const gnutls_datum_t * KEY,
                                             const char *keyid,
-                                            gnutls_openpgp_crt_fmt_t);
+                                            gnutls_openpgp_crt_fmt_t format);
 
   int
     gnutls_certificate_set_openpgp_keyring_mem

diff --git a/libextra/includes/gnutls/extra.h b/libextra/includes/gnutls/extra.h
index 3b9660430455bb0efbfbb9ba8984d77541359a25..0a2c35e1c01f938b2ab34193f57283abf4af1d7e 100644 (file)
--- a/libextra/includes/gnutls/extra.h
+++ b/libextra/includes/gnutls/extra.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -80,8 +80,8 @@ extern "C"
   extern void
     gnutls_ia_set_client_avp_ptr (gnutls_ia_client_credentials_t cred,
                                  void *ptr);
-  extern void *gnutls_ia_get_client_avp_ptr (gnutls_ia_client_credentials_t
-                                            cred);
+  extern void *
+  gnutls_ia_get_client_avp_ptr (gnutls_ia_client_credentials_t cred);
 
   /* Server TLS/IA credential functions. */
   extern void
@@ -90,8 +90,8 @@ extern "C"
   extern void
     gnutls_ia_set_server_avp_ptr (gnutls_ia_server_credentials_t cred,
                                  void *ptr);
-  extern void *gnutls_ia_get_server_avp_ptr (gnutls_ia_server_credentials_t
-                                            cred);
+  extern void *
+  gnutls_ia_get_server_avp_ptr (gnutls_ia_server_credentials_t cred);
 
   /* TLS/IA handshake. */
   extern int gnutls_ia_handshake_p (gnutls_session_t session);