X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_auto.c;h=b9b74628810a9f7e96dc8df5d61f6290ceb4856d;hb=e1944ccd4d1e65f4192783fa9c564c9b747bb618;hp=d7e30e568615dd206f0fcbf51a103791fd9df8f0;hpb=d3f7325607f4711aa6a0c5fa32c133afc67fa266;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_auto.c b/lib/memcached_auto.c
index d7e30e56..b9b74628 100644
--- 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,21 +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;
-
-  memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
+  rc= memcached_do(ptr, server_key, buffer, send_length, 1);
+  if (rc != MEMCACHED_SUCCESS)
+    return rc;
 
   rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
 
@@ -65,7 +60,7 @@ static memcached_return memcached_auto(memcached_st *ptr,
 
 memcached_return memcached_increment(memcached_st *ptr, 
                                      char *key, size_t key_length,
-                                     unsigned int offset,
+                                     uint32_t offset,
                                      uint64_t *value)
 {
   memcached_return rc;
@@ -79,7 +74,7 @@ memcached_return memcached_increment(memcached_st *ptr,
 
 memcached_return memcached_decrement(memcached_st *ptr, 
                                      char *key, size_t key_length,
-                                     unsigned int offset,
+                                     uint32_t offset,
                                      uint64_t *value)
 {
   memcached_return rc;