[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_11_6-104-g04458ba

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=04458ba914735a38a059fb6c7e9ec426441beb21

The branch, gnutls_2_12_x has been updated
       via  04458ba914735a38a059fb6c7e9ec426441beb21 (commit)
      from  aee017b8888c904c42a303586f05a193f778cedb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 04458ba914735a38a059fb6c7e9ec426441beb21
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 16:37:22 2011 +0100

    Fix syntax-check warnings.

-----------------------------------------------------------------------

Summary of changes:
 doc/Makefile.am              |   21 ++++++++++-----------
 doc/cha-programs.texi        |    1 -
 lib/gnutls_privkey.c         |    1 -
 lib/includes/gnutls/compat.h |    2 +-
 lib/includes/gnutls/x509.h   |    1 -
 lib/openpgp/pgp.c            |    1 -
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4aa38b6..31af434 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,9 +20,8 @@
 # along with this file; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-EXTRA_DIST = TODO certtool.cfg gnutls.ps gnutls.pdf    \
-       gnutls.html doxygen/Doxyfile.in doxygen/Doxyfile.orig   \
-       texinfo.css
+EXTRA_DIST = TODO certtool.cfg gnutls.ps gnutls.pdf gnutls.html        \
+       doxygen/Doxyfile.in doxygen/Doxyfile.orig texinfo.css
 
 SUBDIRS = examples cyclo scripts manpages credentials
 if ENABLE_GTK_DOC
@@ -30,19 +29,19 @@ SUBDIRS += reference
 endif
 
 info_TEXINFOS = gnutls.texi
-gnutls_TEXINFOS = gnutls.texi fdl-1.3.texi lgpl-2.1.texi gpl-3.0.texi \
-       cha-auth.texi cha-bib.texi cha-cert-auth.texi cha-ciphersuites.texi \
-       cha-copying.texi cha-functions.texi cha-gtls-app.texi \
-       cha-internals.texi cha-intro-tls.texi cha-library.texi \
-       cha-preface.texi cha-programs.texi cha-tls-app.texi
+gnutls_TEXINFOS = gnutls.texi fdl-1.3.texi lgpl-2.1.texi gpl-3.0.texi  \
+       cha-auth.texi cha-bib.texi cha-cert-auth.texi                   \
+       cha-ciphersuites.texi cha-copying.texi cha-functions.texi       \
+       cha-gtls-app.texi cha-internals.texi cha-intro-tls.texi         \
+       cha-library.texi cha-preface.texi cha-programs.texi             \
+       cha-tls-app.texi
 
 # Examples.
 gnutls_TEXINFOS += examples/ex-client1.c examples/ex-client2.c         \
        examples/ex-session-info.c examples/ex-verify.c                 \
        examples/ex-cert-select.c examples/ex-client-resume.c           \
-       examples/ex-client-srp.c        \
-       examples/ex-rfc2818.c examples/ex-serv1.c                       \
-       examples/ex-serv-anon.c         \
+       examples/ex-client-srp.c examples/ex-rfc2818.c                  \
+       examples/ex-serv1.c examples/ex-serv-anon.c                     \
        examples/ex-serv-pgp.c examples/ex-serv-srp.c                   \
        examples/ex-alert.c examples/ex-x509-info.c examples/ex-crq.c   \
        examples/ex-pkcs12.c
diff --git a/doc/cha-programs.texi b/doc/cha-programs.texi
index db2612a..e92624c 100644
--- a/doc/cha-programs.texi
+++ b/doc/cha-programs.texi
@@ -943,4 +943,3 @@ $ p11tool --login --write pkcs11:(TOKEN URL) 
--load-certificate (certificate fil
 
 Note that typically PKCS #11 private key objects are not allowed
 to be extracted from the token.
-
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index 083ce11..6b930d7 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -600,4 +600,3 @@ gnutls_privkey_decrypt_data (gnutls_privkey_t key,
       return GNUTLS_E_INVALID_REQUEST;
     }
 }
-
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index da95af8..6c3b511 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -7,7 +7,7 @@
 
 #define _GNUTLS_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + 
__GNUC_PATCHLEVEL__)
 
-#if !defined(GNUTLS_INTERNAL_BUILD)
+#if !defined GNUTLS_INTERNAL_BUILD
 #if _GNUTLS_GCC_VERSION >= 30100
 #define _GNUTLS_GCC_ATTR_DEPRECATED __attribute__ ((__deprecated__))
 #endif
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index a85d9e5..b40cae1 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -819,4 +819,3 @@ extern "C"
 #endif
 
 #endif                          /* GNUTLS_X509_H */
-
diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c
index 01f7a70..efef9d2 100644
--- a/lib/openpgp/pgp.c
+++ b/lib/openpgp/pgp.c
@@ -1687,4 +1687,3 @@ gnutls_openpgp_crt_get_auth_subkey (gnutls_openpgp_crt_t 
crt,
   else
     return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
 }
-


hooks/post-receive
-- 
GNU gnutls