Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnutls

8 files changed, 14 insertions, 13 deletions

diff --git a/doc/examples/ex-client-tlsia.c b/doc/examples/ex-client-tlsia.c
index dd81ca0d23..a34f88958b 100644
--- a/doc/examples/ex-client-tlsia.c
+++ b/doc/examples/ex-client-tlsia.c
@@ -1,4 +1,4 @@
-/* Copyright 2007 Free Software Foundation
+/* Copyright 2007, 2008 Free Software Foundation
  *
  * Copying and distribution of this file, with or without modification,
  * are permitted in any medium without royalty provided the copyright
@@ -29,7 +29,7 @@
 extern int tcp_connect (void);
 extern void tcp_close (int sd);
 
-int
+static int
 client_avp (gnutls_session_t session, void *ptr,
 	    const char *last, size_t lastlen, char **new, size_t * newlen)
 {
diff --git a/doc/examples/ex-serv-anon.c b/doc/examples/ex-serv-anon.c
index 5cb25c57df..b6c0aa3f55 100644
--- a/doc/examples/ex-serv-anon.c
+++ b/doc/examples/ex-serv-anon.c
@@ -1,4 +1,4 @@
-/* Copyright 2007 Free Software Foundation
+/* Copyright 2007, 2008 Free Software Foundation
  *
  * Copying and distribution of this file, with or without modification,
  * are permitted in any medium without royalty provided the copyright
@@ -33,7 +33,7 @@
 /* These are global */
 gnutls_anon_server_credentials_t anoncred;
 
-gnutls_session_t
+static gnutls_session_t
 initialize_tls_session (void)
 {
   gnutls_session_t session;
diff --git a/doc/examples/ex-serv-export.c b/doc/examples/ex-serv-export.c
index 2028283595..0f7383f760 100644
--- a/doc/examples/ex-serv-export.c
+++ b/doc/examples/ex-serv-export.c
@@ -47,7 +47,7 @@ static int wrap_db_delete (void *dbf, gnutls_datum_t key);
 
 #define TLS_SESSION_CACHE 50
 
-gnutls_session_t
+static gnutls_session_t
 initialize_tls_session (void)
 {
   gnutls_session_t session;
@@ -92,7 +92,7 @@ static char srp_dh_group2048[] =
   "YWAnkATleuavh05zA85TKZzMBBx7wwjYKlaY86jQw4JxrjX46dv7tpS1yAPYn3rk\n"
   "Nd4jbVJfVHWbZeNy/NaO8g+nER+eSv9zAgEC\n" "-----END DH PARAMETERS-----\n";
 
-int
+static int
 generate_dh_params (void)
 {
   gnutls_datum_t dparams = { srp_dh_group2048, sizeof (srp_dh_group2048) };
diff --git a/doc/examples/ex-serv-pgp.c b/doc/examples/ex-serv-pgp.c
index 6e04732e88..beb1582965 100644
--- a/doc/examples/ex-serv-pgp.c
+++ b/doc/examples/ex-serv-pgp.c
@@ -1,4 +1,4 @@
-/* Copyright 2007 Free Software Foundation
+/* Copyright 2007, 2008 Free Software Foundation
  *
  * Copying and distribution of this file, with or without modification,
  * are permitted in any medium without royalty provided the copyright
@@ -54,7 +54,7 @@ generate_dh_params (void)
   return 0;
 }
 
-gnutls_session_t
+static gnutls_session_t
 initialize_tls_session (void)
 {
   gnutls_session_t session;
diff --git a/doc/examples/ex-serv-psk.c b/doc/examples/ex-serv-psk.c
index 72cfa77b2e..0a1b83c86f 100644
--- a/doc/examples/ex-serv-psk.c
+++ b/doc/examples/ex-serv-psk.c
@@ -42,7 +42,7 @@ gnutls_certificate_credentials_t x509_cred;
 gnutls_psk_server_credentials_t psk_cred;
 gnutls_priority_t priority_cache;
 
-gnutls_session_t
+static gnutls_session_t
 initialize_tls_session (void)
 {
   gnutls_session_t session;
diff --git a/doc/examples/ex-serv-srp.c b/doc/examples/ex-serv-srp.c
index 47bec12e7c..38bf219b44 100644
--- a/doc/examples/ex-serv-srp.c
+++ b/doc/examples/ex-serv-srp.c
@@ -1,4 +1,4 @@
-/* Copyright 2007 Free Software Foundation
+/* Copyright 2007, 2008 Free Software Foundation
  *
  * Copying and distribution of this file, with or without modification,
  * are permitted in any medium without royalty provided the copyright
@@ -40,7 +40,7 @@
 gnutls_srp_server_credentials_t srp_cred;
 gnutls_certificate_credentials_t cert_cred;
 
-gnutls_session_t
+static gnutls_session_t
 initialize_tls_session (void)
 {
   gnutls_session_t session;
diff --git a/doc/examples/ex-serv1.c b/doc/examples/ex-serv1.c
index a9e3124711..c947c6a296 100644
--- a/doc/examples/ex-serv1.c
+++ b/doc/examples/ex-serv1.c
@@ -1,4 +1,4 @@
-/* Copyright 2007 Free Software Foundation
+/* Copyright 2007, 2008 Free Software Foundation
  *
  * Copying and distribution of this file, with or without modification,
  * are permitted in any medium without royalty provided the copyright
@@ -40,7 +40,7 @@
 gnutls_certificate_credentials_t x509_cred;
 gnutls_priority_t priority_cache;
 
-gnutls_session_t
+static gnutls_session_t
 initialize_tls_session (void)
 {
   gnutls_session_t session;
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 27a660b59d..b65821aff1 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -119,6 +119,7 @@ APIMANS += gnutls_dh_params_export_raw.3
 APIMANS += gnutls_error_is_fatal.3
 APIMANS += gnutls_perror.3
 APIMANS += gnutls_strerror.3
+APIMANS += gnutls_strerror_name.3
 APIMANS += gnutls_ext_register.3
 APIMANS += gnutls_global_set_log_function.3
 APIMANS += gnutls_global_set_log_level.3