fixing calculations and code for buffer realloc

1 files changed, 4 insertions, 17 deletions

diff --git a/src/util/connection.c b/src/util/connection.c
index e8a7453d2..57720c07e 100644
--- a/src/util/connection.c
+++ b/src/util/connection.c
@@ -1586,27 +1586,14 @@ GNUNET_CONNECTION_notify_transmit_ready (struct GNUNET_CONNECTION_Handle
                                          GNUNET_CONNECTION_TransmitReadyNotify
                                          notify, void *notify_cls)
 {
-  size_t temp_size;
-#if !REALLOC
-  char *temp_buf;
-#endif
   if (sock->nth.notify_ready != NULL)
     return NULL;
   GNUNET_assert (notify != NULL);
-  if ((sock->write_buffer_size < size) && (size < GNUNET_SERVER_MAX_MESSAGE_SIZE))
+  GNUNET_assert (size < GNUNET_SERVER_MAX_MESSAGE_SIZE);
+  if (sock->write_buffer_size < size)
     {
-      temp_size = sock->write_buffer_size + size + 1;
-      if (temp_size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
-        temp_size = GNUNET_SERVER_MAX_MESSAGE_SIZE;
-#if REALLOC
-      sock->write_buffer = GNUNET_realloc(sock->write_buffer, temp_size);
-#else
-      temp_buf = GNUNET_malloc(temp_size);
-      memcpy(temp_buf, sock->write_buffer, sock->write_buffer_size);
-      GNUNET_free(sock->write_buffer);
-      sock->write_buffer = temp_buf;
-#endif
-      sock->write_buffer_size = temp_size;
+      sock->write_buffer = GNUNET_realloc(sock->write_buffer, size);
+      sock->write_buffer_size = size;
     }
   GNUNET_assert (sock->write_buffer_size >= size);
   GNUNET_assert (sock->write_buffer_off <= sock->write_buffer_size);