X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fauto.c;h=ba7ea6d31dd4d59ea727a177a3e2efd72dc8f7a1;hb=9b767485048053ad0b4c2897a0d3784aa6e9fe10;hp=4fde5827de73f4172b7094a48d1f42b794811c83;hpb=ce11ec5eadbc51ff26aa6b64f52cf36e6b703f46;p=m6w6%2Flibmemcached

diff --git a/libmemcached/auto.c b/libmemcached/auto.c
index 4fde5827..ba7ea6d3 100644
--- a/libmemcached/auto.c
+++ b/libmemcached/auto.c
@@ -11,7 +11,7 @@
 
 #include "common.h"
 
-static memcached_return_t memcached_auto(memcached_st *ptr,
+static memcached_return_t text_incr_decr(memcached_st *ptr,
                                          const char *verb,
                                          const char *master_key, size_t master_key_length,
                                          const char *key, size_t key_length,
@@ -113,7 +113,7 @@ static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
 
   if ((memcached_do(instance, request.bytes,
                     sizeof(request.bytes), 0)!=MEMCACHED_SUCCESS) ||
-      (memcached_io_write(instance, key, key_length, 1) == -1))
+      (memcached_io_write(instance, key, key_length, true) == -1))
   {
     memcached_io_reset(instance);
     return MEMCACHED_WRITE_FAILURE;
@@ -160,7 +160,7 @@ memcached_return_t memcached_increment_by_key(memcached_st *ptr,
   }
   else
   {
-     rc= memcached_auto(ptr, "incr", master_key, master_key_length, key, key_length, offset, value);
+     rc= text_incr_decr(ptr, "incr", master_key, master_key_length, key, key_length, offset, value);
   }
 
   LIBMEMCACHED_MEMCACHED_INCREMENT_END();
@@ -180,12 +180,16 @@ memcached_return_t memcached_decrement_by_key(memcached_st *ptr,
 
   LIBMEMCACHED_MEMCACHED_DECREMENT_START();
   if (ptr->flags.binary_protocol)
+  {
     rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT,
                          master_key, master_key_length, key, key_length,
                          (uint64_t)offset, 0, MEMCACHED_EXPIRATION_NOT_ADD,
                          value);
+  }
   else
-    rc= memcached_auto(ptr, "decr", master_key, master_key_length, key, key_length, offset, value);
+  {
+    rc= text_incr_decr(ptr, "decr", master_key, master_key_length, key, key_length, offset, value);
+  }
 
   LIBMEMCACHED_MEMCACHED_DECREMENT_END();