From: Simon Josefsson <simon@josefsson.org>
Date: Sun, 3 May 2009 21:11:44 +0000 (+0200)
Subject: Fix gtk-doc warnings.
X-Git-Tag: gnutls_2_7_9~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2e7c77d0410c1fcd76a931acf73505f6452cd40;p=thirdparty%2Fgnutls.git

Fix gtk-doc warnings.
---

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 46ef722959..ed7c6f34b8 100644
--- 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 316a12ee24..800a00e315 100644
--- 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 3b96604304..0a2c35e1c0 100644
--- 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);