From: Jonathan Bastien-Filiatrault <joe@x2a.org>
Date: Sat, 15 Aug 2009 18:36:42 +0000 (-0400)
Subject: Remove now useless _gnutls_mbuffer_enqueue{,copy} functions.
X-Git-Tag: gnutls_2_11_3~317
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8efb9f644163b690fab12cd18f0a0cd509b3e29;p=thirdparty%2Fgnutls.git

Remove now useless _gnutls_mbuffer_enqueue{,copy} functions.
---

diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index 29121d2b01..256203fa03 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -670,7 +670,7 @@ _gnutls_io_write_buffered (gnutls_session_t session,
 {
   mbuffer_head_st * const send_buffer = &session->internals.record_send_buffer;
 
-  _gnutls_mbuffer_enqueue_mbuffer (send_buffer, bufel);
+  _gnutls_mbuffer_enqueue (send_buffer, bufel);
 
   _gnutls_write_log
     ("WRITE: enqueued %d bytes for %p. Total %d bytes.\n",
diff --git a/lib/gnutls_mbuffers.c b/lib/gnutls_mbuffers.c
index 4401304a6e..54470b8514 100644
--- a/lib/gnutls_mbuffers.c
+++ b/lib/gnutls_mbuffers.c
@@ -51,48 +51,8 @@ _gnutls_mbuffer_clear (mbuffer_head_st *buf)
   _gnutls_mbuffer_init (buf);
 }
 
-int
-_gnutls_mbuffer_enqueue (mbuffer_head_st *buf, const gnutls_datum_t *msg)
-{
-  mbuffer_st *bufel = gnutls_malloc (sizeof (mbuffer_st));
-
-  if (bufel == NULL)
-    {
-      gnutls_assert ();
-      return GNUTLS_E_MEMORY_ERROR;
-    }
-
-  bufel->next = NULL;
-  bufel->mark = 0;
-
-  bufel->msg = *msg;
-
-  _gnutls_mbuffer_enqueue_mbuffer(buf, bufel);
-
-  return 0;
-}
-
-int
-_gnutls_mbuffer_enqueue_copy (mbuffer_head_st *buf, const gnutls_datum_t *msg)
-{
-  gnutls_datum_t msg_copy;
-
-  msg_copy.data = gnutls_malloc (msg->size);
-
-  if (msg_copy.data == NULL)
-    {
-      gnutls_assert ();
-      return GNUTLS_E_MEMORY_ERROR;
-    }
-
-  msg_copy.size = msg->size;
-  memcpy (msg_copy.data, msg->data, msg_copy.size);
-
-  return _gnutls_mbuffer_enqueue (buf, &msg_copy);
-}
-
 void
-_gnutls_mbuffer_enqueue_mbuffer (mbuffer_head_st *buf, mbuffer_st *bufel)
+_gnutls_mbuffer_enqueue (mbuffer_head_st *buf, mbuffer_st *bufel)
 {
   bufel->next = NULL;
 
diff --git a/lib/gnutls_mbuffers.h b/lib/gnutls_mbuffers.h
index 0cb7cc3e33..df2dc0ee6a 100644
--- a/lib/gnutls_mbuffers.h
+++ b/lib/gnutls_mbuffers.h
@@ -29,9 +29,7 @@
 
 void _gnutls_mbuffer_init (mbuffer_head_st *buf);
 void _gnutls_mbuffer_clear (mbuffer_head_st *buf);
-int  _gnutls_mbuffer_enqueue (mbuffer_head_st *buf, const gnutls_datum_t *msg);
-int  _gnutls_mbuffer_enqueue_copy (mbuffer_head_st *buf, const gnutls_datum_t *msg);
-void _gnutls_mbuffer_enqueue_mbuffer (mbuffer_head_st *buf, mbuffer_st *bufel);
+void _gnutls_mbuffer_enqueue (mbuffer_head_st *buf, mbuffer_st *bufel);
 void _gnutls_mbuffer_get_head (mbuffer_head_st *buf, gnutls_datum_t *msg);
 int  _gnutls_mbuffer_remove_bytes (mbuffer_head_st *buf, size_t bytes);
 mbuffer_st* _gnutls_mbuffer_alloc (size_t payload_size);