Fix syntax-check warnings.

.x-sc_GPL_version

@@ -0,0 +1,4 @@
+^doc/lgpl-2.1.texi
+^doc/protocol/
+^lib/
+^m4/pkg.m4

.x-sc_avoid_if_before_free

@@ -0,0 +1,3 @@
+^gl/
+^lib/gl/
+^src/cfg/

.x-sc_cast_of_alloca_return_value

@@ -0,0 +1,3 @@
+^gl/
+^guile/
+^lib/gl/

.x-sc_cast_of_argument_to_free

@@ -0,0 +1 @@
+^src/cfg/

.x-sc_file_system

@@ -0,0 +1,2 @@
+^doc/doxygen/
+^doc/protocol/

.x-sc_m4_quote_check

@@ -0,0 +1 @@
+^lib/gl/m4/intl.m4

.x-sc_makefile_check

@@ -0,0 +1,2 @@
+^gl/
+^lib/gl/

.x-sc_program_name

@@ -0,0 +1,5 @@
+^doc/
+^gl/
+^lib/gl/
+^src/cfg/
+^tests/

.x-sc_prohibit_HAVE_MBRTOWC

@@ -0,0 +1,2 @@
+^gl/
+^lib/gl/

.x-sc_prohibit_S_IS_definition

@@ -0,0 +1,2 @@
+^gl/sys_stat.in.h
+^lib/gl/sys_stat.in.h

.x-sc_space_tab

@@ -0,0 +1,9 @@
+*.png
+^ChangeLog
+^doc/protocol/
+^gl/
+^lib/gl/
+^lib/minitasn1/
+^libextra/gl/
+^tests/nist-pkits/
+^tests/x509paths/

.x-sc_the_the

@@ -0,0 +1,3 @@
+^doc/protocol/
+^lib/minitasn1/
+^tests/rsa-md5-collision/mbox

.x-sc_two_space_separator_in_usage

@@ -0,0 +1,3 @@
+^build-aux/gnupload
+^doc/gnutls.texi
+^tests/sha2/sha2

.x-sc_useless_cpp_parens

@@ -0,0 +1,4 @@
+^gl/
+^lib/gl/
+^src/cfg/
+^src/.*-gaa.c

NEWS

@@ -3131,7 +3131,7 @@ up to date information.
 
 ** Fix gnutls-cli-debug regarding resume support detection.
 Earlier, if the session-id from the server had a length of 0, it would
-indicate the the server supports resumption, which isn't the case.
+indicate that the server supports resumption, which isn't the case.
 Reported by Kataja Kai <[email protected]>.
 
 ** Fix building of examples on FreeBSD by including netinet/in.h.

cfg.mk

@@ -29,7 +29,10 @@ endif
 PODIR := lib/po
 PO_DOMAIN := libgnutls
 
-local-checks-to-skip = sc_prohibit_strcmp
+local-checks-to-skip = sc_prohibit_strcmp sc_prohibit_atoi_atof		\
+	sc_error_message_uppercase sc_prohibit_have_config_h		\
+	sc_require_config_h sc_require_config_h_first			\
+	sc_trailing_blank sc_unmarked_diagnostics sc_immutable_NEWS
 
 autoreconf:
 	for f in $(PODIR)/*.po.in; do \

doc/examples/ex-serv-export.c

@@ -1,4 +1,4 @@
-/* Copyright 2007, 2008 Free Software Foundation
+/* Copyright 2007, 2008, 2009 Free Software Foundation
  *
  * Copying and distribution of this file, with or without modification,
  * are permitted in any medium without royalty provided the copyright
@@ -292,8 +292,7 @@ wrap_db_init (void)
 static void
 wrap_db_deinit (void)
 {
-  if (cache_db)
-    free (cache_db);
+  free (cache_db);
   cache_db = NULL;
   return;
 }

doc/gnutls.texi

@@ -1,5 +1,4 @@
 \input texinfo   @c -*-texinfo-*-
-@comment $Id$
 @comment %**start of header
 @setfilename gnutls.info
 @include version.texi
@@ -18,7 +17,7 @@
 This manual is last updated @value{UPDATED} for version
 @value{VERSION} of GNU TLS.
 
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

gtk-doc.make

@@ -23,7 +23,7 @@ GPATH = $(srcdir)
 
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
 
-EXTRA_DIST = 				\
+EXTRA_DIST =				\
 	$(content_files)		\
 	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
@@ -33,8 +33,8 @@ EXTRA_DIST = 				\
 DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
 	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
 
-SCANOBJ_FILES = 		 \
-	$(DOC_MODULE).args 	 \
+SCANOBJ_FILES =			 \
+	$(DOC_MODULE).args	 \
 	$(DOC_MODULE).hierarchy  \
 	$(DOC_MODULE).interfaces \
 	$(DOC_MODULE).prerequisites \

lib/gnutls.asn

@@ -17,27 +17,27 @@ RSAPublicKey ::= SEQUENCE {
 -- CRT algorithm.
 --
 RSAPrivateKey ::= SEQUENCE {
-        version          	Version,
-        modulus          	INTEGER, -- (Usually large) n
-        publicExponent   	INTEGER, -- (Usually small) e
-        privateExponent  	INTEGER, -- (Usually large) d
-        prime1           	INTEGER, -- (Usually large) p
-	prime2           	INTEGER, -- (Usually large) q
-	exponent1        	INTEGER, -- (Usually large) d mod (p-1)
-	exponent2        	INTEGER, -- (Usually large) d mod (q-1)
-	coefficient      	INTEGER, -- (Usually large) (inverse of q) mod p
-	otherPrimeInfos 	OtherPrimeInfos OPTIONAL
+  version          Version,
+  modulus          INTEGER, -- (Usually large) n
+  publicExponent   INTEGER, -- (Usually small) e
+  privateExponent  INTEGER, -- (Usually large) d
+  prime1           INTEGER, -- (Usually large) p
+  prime2           INTEGER, -- (Usually large) q
+  exponent1        INTEGER, -- (Usually large) d mod (p-1)
+  exponent2        INTEGER, -- (Usually large) d mod (q-1)
+  coefficient      INTEGER, -- (Usually large) (inverse of q) mod p
+  otherPrimeInfos  OtherPrimeInfos OPTIONAL
 }
 
 Version ::= INTEGER { two-prime(0), multi(1) }
---	(CONSTRAINED BY { version must be multi if otherPrimeInfos present }) --
+-- (CONSTRAINED BY { version must be multi if otherPrimeInfos present }) --
 
 OtherPrimeInfos ::= SEQUENCE SIZE(1..MAX) OF OtherPrimeInfo
 
 OtherPrimeInfo ::= SEQUENCE {
-	prime INTEGER,  -- ri
-	exponent INTEGER, -- di
-	coefficient INTEGER -- ti 
+  prime INTEGER,  -- ri
+  exponent INTEGER, -- di
+  coefficient INTEGER -- ti 
 }
 
 -- for signature calculation
@@ -74,19 +74,19 @@ DSASignatureValue ::= SEQUENCE {
 }
 
 DSAPrivateKey ::= SEQUENCE {
-        version          	INTEGER, -- should be zero
-        p          		INTEGER,
-        q   			INTEGER,
-        g  			INTEGER,
-        Y	     	      	INTEGER, -- public
-	priv           		INTEGER
+  version  INTEGER, -- should be zero
+  p        INTEGER,
+  q        INTEGER,
+  g        INTEGER,
+  Y        INTEGER, -- public
+  priv     INTEGER
 }
 
 -- from PKCS#3
 DHParameter ::= SEQUENCE {
-	prime INTEGER, -- p
-	base INTEGER, -- g
-	privateValueLength INTEGER OPTIONAL 
+  prime               INTEGER, -- p
+  base                INTEGER, -- g
+  privateValueLength  INTEGER OPTIONAL 
 }
 
 

lib/m4/hooks.m4

@@ -51,7 +51,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
       included_libtasn1=no)
   if test "$included_libtasn1" = "no"; then
     AC_LIB_HAVE_LINKFLAGS(tasn1,, [#include <libtasn1.h>],
-    				[asn1_check_version (NULL)])
+                          [asn1_check_version (NULL)])
     if test "$ac_cv_libtasn1" != yes; then
       included_libtasn1=yes
       AC_MSG_WARN([[
@@ -84,7 +84,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   fi
   AC_SUBST(LZO_LIBS)
   if test "$use_lzo" = "yes"; then
-    AC_DEFINE(USE_LZO, 1, [whether to use the LZO compression])
+    AC_DEFINE([USE_LZO], 1, [whether to use the LZO compression])
     if test "$LZO_LIBS" = "-llzo"; then
       AC_CHECK_HEADERS(lzo1x.h)
     elif test "$LZO_LIBS" = "-llzo2"; then
@@ -101,7 +101,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
     test_mac(x,y,z);
     return 0;
   ], [
-    AC_DEFINE(C99_MACROS, 1, [C99 macros are supported])
+    AC_DEFINE([C99_MACROS], 1, [C99 macros are supported])
     AC_MSG_RESULT(yes)
   ], [
     AC_MSG_RESULT(no)
@@ -110,9 +110,9 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
 
   AC_MSG_CHECKING([whether to enable Opaque PRF input support])
   AC_ARG_ENABLE(opaque-prf-input,
-  	AS_HELP_STRING([--enable-opaque-prf-input=DD],
-  		[enable Opaque PRF input using DD as extension type]),
-  	ac_opaque_prf_input=$enableval, ac_opaque_prf_input=no)
+    AS_HELP_STRING([--enable-opaque-prf-input=DD],
+                   [enable Opaque PRF input using DD as extension type]),
+    ac_opaque_prf_input=$enableval, ac_opaque_prf_input=no)
   if test "$ac_opaque_prf_input" != "no"; then
     if ! echo $ac_opaque_prf_input | egrep -q '^[[0-9]]+$'; then
       ac_opaque_prf_input=no
@@ -124,7 +124,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   fi
   if test "$ac_opaque_prf_input" != "no"; then
    AC_MSG_RESULT([yes (extension value $ac_opaque_prf_input)])
-   AC_DEFINE_UNQUOTED(ENABLE_OPRFI, $ac_opaque_prf_input,
+   AC_DEFINE_UNQUOTED([ENABLE_OPRFI], $ac_opaque_prf_input,
                       [enable Opaque PRF Input])
   else
    AC_MSG_RESULT(no)
@@ -133,12 +133,12 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   
   AC_MSG_CHECKING([whether to disable SRP authentication support])
   AC_ARG_ENABLE(srp-authentication,
-  	AS_HELP_STRING([--disable-srp-authentication],
-  		[disable the SRP authentication support]),
-  	ac_enable_srp=no)
+    AS_HELP_STRING([--disable-srp-authentication],
+                   [disable the SRP authentication support]),
+    ac_enable_srp=no)
   if test x$ac_enable_srp != xno; then
    AC_MSG_RESULT(no)
-   AC_DEFINE(ENABLE_SRP, 1, [enable SRP authentication])
+   AC_DEFINE([ENABLE_SRP], 1, [enable SRP authentication])
   else
    ac_full=0
    AC_MSG_RESULT(yes)
@@ -147,12 +147,12 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   
   AC_MSG_CHECKING([whether to disable PSK authentication support])
   AC_ARG_ENABLE(psk-authentication,
-         AS_HELP_STRING([--disable-psk-authentication],
-                 [disable the PSK authentication support]),
-         ac_enable_psk=no)
+    AS_HELP_STRING([--disable-psk-authentication],
+                   [disable the PSK authentication support]),
+    ac_enable_psk=no)
   if test x$ac_enable_psk != xno; then
    AC_MSG_RESULT(no)
-   AC_DEFINE(ENABLE_PSK, 1, [enable PSK authentication])
+   AC_DEFINE([ENABLE_PSK], 1, [enable PSK authentication])
   else
    ac_full=0
    AC_MSG_RESULT(yes)
@@ -161,12 +161,12 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   
   AC_MSG_CHECKING([whether to disable anonymous authentication support])
   AC_ARG_ENABLE(anon-authentication,
-  	AS_HELP_STRING([--disable-anon-authentication],
-  		[disable the anonymous authentication support]),
-  	ac_enable_anon=no)
+    AS_HELP_STRING([--disable-anon-authentication],
+                   [disable the anonymous authentication support]),
+    ac_enable_anon=no)
   if test x$ac_enable_anon != xno; then
    AC_MSG_RESULT(no)
-   AC_DEFINE(ENABLE_ANON, 1, [enable anonymous authentication])
+   AC_DEFINE([ENABLE_ANON], 1, [enable anonymous authentication])
   else
    ac_full=0
    AC_MSG_RESULT(yes)
@@ -180,36 +180,36 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   AC_MSG_CHECKING([whether to disable Camellia cipher])
   if test "$enable_camellia" != "no"; then
    AC_MSG_RESULT([no])
-   AC_DEFINE(ENABLE_CAMELLIA, 1, [enable camellia block cipher])
+   AC_DEFINE([ENABLE_CAMELLIA], 1, [enable camellia block cipher])
   else
    AC_MSG_RESULT([yes])
   fi
   
   AC_MSG_CHECKING([whether to disable extra PKI stuff])
   AC_ARG_ENABLE(extra-pki,
-  	AS_HELP_STRING([--disable-extra-pki],
-  		[only enable the basic PKI stuff]),
-  	enable_pki=$enableval, enable_pki=yes)
+    AS_HELP_STRING([--disable-extra-pki],
+                   [only enable the basic PKI stuff]),
+    enable_pki=$enableval, enable_pki=yes)
   if test "$enable_pki" != "yes"; then
    ac_full=0
    AC_MSG_RESULT(yes)
   else
    AC_MSG_RESULT(no)
-   AC_DEFINE(ENABLE_PKI, 1, [whether to include all the PKCS/PKI stuff])
+   AC_DEFINE([ENABLE_PKI], 1, [whether to include all the PKCS/PKI stuff])
   fi
   AM_CONDITIONAL(ENABLE_PKI, test "$enable_pki" = "yes")
   
   ac_enable_openpgp=yes
   AC_MSG_CHECKING([whether to disable OpenPGP Certificate authentication support])
   AC_ARG_ENABLE(openpgp-authentication,
-  	AS_HELP_STRING([--disable-openpgp-authentication],
-  		[disable the OpenPGP authentication support]),
-  	ac_enable_openpgp=no)
+    AS_HELP_STRING([--disable-openpgp-authentication],
+                   [disable the OpenPGP authentication support]),
+    ac_enable_openpgp=no)
   if test x$ac_enable_openpgp = xno; then
    AC_MSG_RESULT(yes)
    ac_full=0
   else
-   AC_DEFINE(ENABLE_OPENPGP, 1, [use openpgp authentication])
+   AC_DEFINE([ENABLE_OPENPGP], 1, [use openpgp authentication])
    AC_MSG_RESULT(no)
   fi
   AM_CONDITIONAL(ENABLE_OPENPGP, test "$ac_enable_openpgp" = "yes")
@@ -221,11 +221,11 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   AC_CHECK_SIZEOF(int)
   case $ac_cv_sizeof_void_p in
     $ac_cv_sizeof_long)
-      AC_DEFINE(GNUTLS_POINTER_TO_INT_CAST, [(long)],
+      AC_DEFINE([GNUTLS_POINTER_TO_INT_CAST], [(long)],
                 [Additional cast to bring void* to a type castable to int.])
       ;;
     *)
-      AC_DEFINE(GNUTLS_POINTER_TO_INT_CAST, [])
+      AC_DEFINE([GNUTLS_POINTER_TO_INT_CAST], [])
       ;;
   esac
 ])

lib/openpgp/Makefile.am

@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
 #
 # Author: Nikos Mavrogiannopoulos
 #
@@ -24,7 +24,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = \
 	-I$(srcdir)/../gl		\
 	-I$(builddir)/../gl		\
-	-I$(srcdir)/../includes 	\
+	-I$(srcdir)/../includes		\
 	-I$(builddir)/../includes	\
 	-I$(srcdir)/..			\
 	-I$(srcdir)/../opencdk