[SCM] GNU gnutls branch, master, updated. gnutls_3_0_9-56-g5440504

[Nikos Mavrogiannopoulos]

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=5440504c39326d35fa02bb61f1f6248dc115ee2f

The branch, master has been updated
       via  5440504c39326d35fa02bb61f1f6248dc115ee2f (commit)
      from  9710320f8e5a84b3f97efb5fbb24903e00e5fe13 (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 5440504c39326d35fa02bb61f1f6248dc115ee2f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Dec 31 11:45:19 2011 +0200

    removed cdk_armor_filter_use()

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

Summary of changes:
 lib/opencdk/armor.c   |   29 -----------------------------
 lib/opencdk/opencdk.h |    2 --
 2 files changed, 0 insertions(+), 31 deletions(-)

diff --git a/lib/opencdk/armor.c b/lib/opencdk/armor.c
index 19b8d4b..8169980 100644
--- a/lib/opencdk/armor.c
+++ b/lib/opencdk/armor.c
@@ -426,35 +426,6 @@ armor_encode (void *data, FILE * in, FILE * out)
   return 0;
 }
 
-
-/**
- * cdk_armor_filter_use:
- * @inp: the stream to check
- *
- * Check if the stream contains armored data.
- **/
-int
-cdk_armor_filter_use (cdk_stream_t inp)
-{
-  int c, check;
-  int zipalgo;
-
-  zipalgo = 0;
-  c = cdk_stream_getc (inp);
-  if (c == EOF)
-    return 0;                   /* EOF, doesn't matter whether armored or not 
*/
-  cdk_stream_seek (inp, 0);
-  check = is_armored (c);
-  if (check)
-    {
-      check = check_armor (inp, &zipalgo);
-      if (zipalgo)
-        _cdk_stream_set_compress_algo (inp, zipalgo);
-    }
-  return check;
-}
-
-
 static int
 search_header (const char *buf, const char **array)
 {
diff --git a/lib/opencdk/opencdk.h b/lib/opencdk/opencdk.h
index 85531bb..335f9a7 100644
--- a/lib/opencdk/opencdk.h
+++ b/lib/opencdk/opencdk.h
@@ -699,8 +699,6 @@ extern "C"
                            const unsigned char *salt);
   void cdk_s2k_free (cdk_s2k_t s2k);
 
-  int cdk_armor_filter_use (cdk_stream_t inp);
-
 /* Protect the inbuf with ASCII armor of the specified type.
    If @outbuf and @outlen are NULL, the function returns the calculated
    size of the base64 encoded data in @nwritten. */


hooks/post-receive
-- 
GNU gnutls