[SCM] GNU gnutls branch, master, updated. gnutls_2_11_4-58-g2ce60a0

[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=2ce60a0a71e85a00f58e6f8643b973c5bea685b0

The branch, master has been updated
       via  2ce60a0a71e85a00f58e6f8643b973c5bea685b0 (commit)
       via  354a9828de07d7c70bf290d40d106c52de93cb75 (commit)
      from  705bd41bc85effe81660de90acf10f65bb23977c (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 2ce60a0a71e85a00f58e6f8643b973c5bea685b0
Author: Simon Josefsson <address@hidden>
Date:   Mon Dec 6 16:24:34 2010 +0100

    Fix syntax-check nits.

commit 354a9828de07d7c70bf290d40d106c52de93cb75
Author: Simon Josefsson <address@hidden>
Date:   Mon Dec 6 16:22:17 2010 +0100

    Ignore more.

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

Summary of changes:
 .x-sc_bindtextdomain  |    3 +++
 lib/gnutls_priority.c |    6 +++---
 lib/pkcs11_secret.c   |    1 -
 src/p11tool.c         |    1 -
 src/p11tool.gaa       |    3 ++-
 5 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 .x-sc_bindtextdomain

diff --git a/.x-sc_bindtextdomain b/.x-sc_bindtextdomain
new file mode 100644
index 0000000..14fd122
--- /dev/null
+++ b/.x-sc_bindtextdomain
@@ -0,0 +1,3 @@
+^tests/.*
+^doc/.*
+^src/.*
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 5d6e494..0912a56 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -688,7 +688,7 @@ gnutls_priority_init (gnutls_priority_t * priority_cache,
                }
              else 
                {
-                 if ((algo =
+                 if ((algo =
                       gnutls_protocol_get_id (&broken_list[i][6])) !=
                      GNUTLS_VERSION_UNKNOWN)
                     fn (&(*priority_cache)->protocol, algo);
@@ -737,9 +737,9 @@ gnutls_priority_init (gnutls_priority_t * priority_cache,
              else 
                {
                  if ((algo =
-                      gnutls_sign_get_id (&broken_list[i][6])) !=
+                      gnutls_sign_get_id (&broken_list[i][6])) !=
                       GNUTLS_SIGN_UNKNOWN)
-                   fn (&(*priority_cache)->sign_algo, algo);
+                   fn (&(*priority_cache)->sign_algo, algo);
                   else
                     goto error;
                 }
diff --git a/lib/pkcs11_secret.c b/lib/pkcs11_secret.c
index 056bad4..88fe05f 100644
--- a/lib/pkcs11_secret.c
+++ b/lib/pkcs11_secret.c
@@ -147,4 +147,3 @@ cleanup:
   return ret;
 
 }
-
diff --git a/src/p11tool.c b/src/p11tool.c
index 39a54f9..2cd7a4b 100644
--- a/src/p11tool.c
+++ b/src/p11tool.c
@@ -166,4 +166,3 @@ gaa_parser (int argc, char **argv)
   gnutls_pkcs11_deinit ();
   gnutls_global_deinit ();
 }
-
diff --git a/src/p11tool.gaa b/src/p11tool.gaa
index 9b7fe4d..256aad2 100644
--- a/src/p11tool.gaa
+++ b/src/p11tool.gaa
@@ -82,7 +82,8 @@ option (d, debug) INT "LEVEL" { $debug = $1 } "specify the 
debug level. Default
 
 option (h, help) { gaa_help(); exit(0); } "shows this help text"
 
-init {         $action = -1; $pkcs11_provider= NULL; $outfile = NULL; $pubkey 
= NULL; $privkey = NULL;
+init {
+       $action = -1; $pkcs11_provider= NULL; $outfile = NULL; $pubkey = NULL; 
$privkey = NULL;
        $pkcs11_url = NULL; $pkcs11_type = PKCS11_TYPE_PK; $pubkey=NULL; 
$pkcs11_label = NULL; 
        $pkcs11_trusted=0; $pkcs11_login = 0; $pkcs11_detailed_url = 
GNUTLS_PKCS11_URL_LIB; 
        $secret_key = NULL; $cert = NULL; $incert_format = 0; }


hooks/post-receive
-- 
GNU gnutls