From: Brian Aker <brian@tangent.org>
Date: Thu, 5 Jan 2012 06:16:04 +0000 (-0800)
Subject: Remove dead UDP code.
X-Git-Tag: 1.0.3~3^2^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=651ddd54069f57b25c5fade3cfcd736c7e220e6d;p=m6w6%2Flibmemcached

Remove dead UDP code.
---

diff --git a/libmemcached/io.cc b/libmemcached/io.cc
index e7a0627e..538f1537 100644
--- a/libmemcached/io.cc
+++ b/libmemcached/io.cc
@@ -579,25 +579,9 @@ static ssize_t _io_write(memcached_server_write_instance_st ptr,
   while (length)
   {
     char *write_ptr;
-    size_t should_write;
-    size_t buffer_end;
-
-    if (memcached_is_udp(ptr->root))
-    {
-      //UDP does not support partial writes
-      buffer_end= MAX_UDP_DATAGRAM_LENGTH;
-      should_write= length;
-      if (ptr->write_buffer_offset + should_write > buffer_end)
-      {
-        return -1;
-      }
-    }
-    else
-    {
-      buffer_end= MEMCACHED_MAX_BUFFER;
-      should_write= buffer_end - ptr->write_buffer_offset;
-      should_write= (should_write < length) ? should_write : length;
-    }
+    size_t buffer_end= MEMCACHED_MAX_BUFFER;
+    size_t should_write= buffer_end -ptr->write_buffer_offset;
+    should_write= (should_write < length) ? should_write : length;
 
     write_ptr= ptr->write_buffer + ptr->write_buffer_offset;
     memcpy(write_ptr, buffer_ptr, should_write);
@@ -605,7 +589,7 @@ static ssize_t _io_write(memcached_server_write_instance_st ptr,
     buffer_ptr+= should_write;
     length-= should_write;
 
-    if (ptr->write_buffer_offset == buffer_end and memcached_is_udp(ptr->root) == false)
+    if (ptr->write_buffer_offset == buffer_end)
     {
       WATCHPOINT_ASSERT(ptr->fd != INVALID_SOCKET);