X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fauto.c;h=608324df23ff8d99acde7960997ab74cd8c824a1;hb=56bb95c23210147d45b792e4e494e995d9de76dc;hp=017f7f395571ba6e48c2575f9e01788bd7b23db8;hpb=3928e14fbe1ed17cefe9bdbbb282fb7ecf053e7a;p=awesomized%2Flibmemcached

diff --git a/libmemcached/auto.c b/libmemcached/auto.c
index 017f7f39..608324df 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,
@@ -35,14 +35,15 @@ static memcached_return_t memcached_auto(memcached_st *ptr,
   instance= memcached_server_instance_fetch(ptr, server_key);
 
   send_length= (size_t)snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
-                                "%s %s%.*s %" PRIu64 "%s\r\n", verb,
+                                "%s %.*s%.*s %" PRIu64 "%s\r\n", verb,
+                                (int)ptr->prefix_key_length,
                                 ptr->prefix_key,
                                 (int)key_length, key,
                                 offset, no_reply ? " noreply" : "");
   unlikely (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
     return MEMCACHED_WRITE_FAILURE;
 
-  rc= memcached_do(instance, buffer, send_length, 1);
+  rc= memcached_do(instance, buffer, send_length, true);
   if (no_reply || rc != MEMCACHED_SUCCESS)
     return rc;
 
@@ -111,8 +112,8 @@ static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
   request.message.body.expiration= htonl((uint32_t) expiration);
 
   if ((memcached_do(instance, request.bytes,
-                    sizeof(request.bytes), 0)!=MEMCACHED_SUCCESS) ||
-      (memcached_io_write(instance, key, key_length, 1) == -1))
+                    sizeof(request.bytes), false) != MEMCACHED_SUCCESS) ||
+      (memcached_io_write(instance, key, key_length, true) == -1))
   {
     memcached_io_reset(instance);
     return MEMCACHED_WRITE_FAILURE;
@@ -159,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();
@@ -179,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();