From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 9 Nov 2011 10:02:17 +0000 (+0100)
Subject: Remove dead code and use more static.
X-Git-Tag: gnutls_3_0_8~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e71de0c575571ae86b507b9c1678ef53fa9e64fd;p=thirdparty%2Fgnutls.git

Remove dead code and use more static.
---

diff --git a/lib/x509_b64.c b/lib/x509_b64.c
index 4da11fed1c..f0fbb74850 100644
--- a/lib/x509_b64.c
+++ b/lib/x509_b64.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2010 Free Software
- * Foundation, Inc.
+ * Copyright (C) 2000-2011 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -137,38 +136,6 @@ decode (uint8_t * result, const opaque * data)
   return ret;
 }
 
-/* encodes data and puts the result into result (locally allocated)
- * The result_size is the return value
- */
-int
-_gnutls_base64_encode (const uint8_t * data, size_t data_size,
-                       uint8_t ** result)
-{
-  unsigned int i, j;
-  int ret, tmp;
-  char tmpres[4];
-
-  ret = B64SIZE (data_size);
-
-  (*result) = gnutls_malloc (ret + 1);
-  if ((*result) == NULL)
-    return GNUTLS_E_MEMORY_ERROR;
-
-  for (i = j = 0; i < data_size; i += 3, j += 4)
-    {
-      tmp = encode (tmpres, &data[i], data_size - i);
-      if (tmp == -1)
-        {
-          gnutls_free ((*result));
-          return GNUTLS_E_MEMORY_ERROR;
-        }
-      memcpy (&(*result)[j], tmpres, tmp);
-    }
-  (*result)[ret] = 0;           /* null terminated */
-
-  return ret;
-}
-
 #define INCR(what, size) \
 	do { \
 	what+=size; \
@@ -365,7 +332,7 @@ gnutls_pem_base64_encode_alloc (const char *msg,
 /* decodes data and puts the result into result (locally allocated)
  * The result_size is the return value
  */
-int
+static int
 _gnutls_base64_decode (const uint8_t * data, size_t data_size,
                        uint8_t ** result)
 {
diff --git a/lib/x509_b64.h b/lib/x509_b64.h
index 10bc9fa15c..a3bf1354e5 100644
--- a/lib/x509_b64.h
+++ b/lib/x509_b64.h
@@ -20,12 +20,8 @@
  *
  */
 
-int _gnutls_base64_encode (const uint8_t * data, size_t data_size,
-                           uint8_t ** result);
 int _gnutls_fbase64_encode (const char *msg, const uint8_t * data,
                             int data_size, uint8_t ** result);
-int _gnutls_base64_decode (const uint8_t * data, size_t data_size,
-                           uint8_t ** result);
 int _gnutls_fbase64_decode (const char *header, const uint8_t * data,
                             size_t data_size, uint8_t ** result);