Refactor all code to go through memcached_do().

[m6w6/libmemcached] / lib / memcached_auto.c

diff --git a/lib/memcached_auto.c b/lib/memcached_auto.c
index d7e30e568615dd206f0fcbf51a103791fd9df8f0..61ad91259377f3670614642789ae97f47e27a5c9 100644 (file)
--- a/lib/memcached_auto.c
+++ b/lib/memcached_auto.c
@@ -6,7 +6,7 @@ static memcached_return memcached_auto(memcached_st *ptr,
                                        unsigned int offset,
                                        uint64_t *value)
 {
-  size_t send_length, sent_length;
+  size_t send_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
@@ -19,19 +19,16 @@ static memcached_return memcached_auto(memcached_st *ptr,
 
   server_key= memcached_generate_hash(ptr, key, key_length);
 
-  if ((rc= memcached_connect(ptr, server_key)) != MEMCACHED_SUCCESS)
-    return rc;
-
   send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                         "%s %.*s %u\r\n", verb, 
                         (int)key_length, key,
                         offset);
   if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
     return MEMCACHED_WRITE_FAILURE;
-  sent_length= memcached_io_write(ptr, server_key, buffer, send_length, 1);
 
-  if (sent_length == -1 || sent_length != send_length)
-    return MEMCACHED_WRITE_FAILURE;
+  rc= memcached_do(ptr, server_key, buffer, send_length, 1);
+  if (rc != MEMCACHED_SUCCESS)
+    return rc;
 
   memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);