X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fauto.cc;h=06e7ab6419646abb82121ce5d9a775fb5aaeaa07;hb=ae6ce3499b07751cb8b72c960a2a0edfcd4c83a1;hp=57d6d2fdc00311e339d12f36efc9fea9cf3ef7c8;hpb=c5bd49aee7b7bcb434cc526ff67d4bccddd4ba90;p=awesomized%2Flibmemcached

diff --git a/libmemcached/auto.cc b/libmemcached/auto.cc
index 57d6d2fd..06e7ab64 100644
--- a/libmemcached/auto.cc
+++ b/libmemcached/auto.cc
@@ -37,7 +37,7 @@
 
 #include <libmemcached/common.h>
 
-static void auto_response(org::libmemcached::Instance* instance, const bool reply,  memcached_return_t& rc, uint64_t* value)
+static void auto_response(memcached_instance_st* instance, const bool reply,  memcached_return_t& rc, uint64_t* value)
 {
   // If the message was successfully sent, then get the response, otherwise
   // fail.
@@ -54,17 +54,21 @@ static void auto_response(org::libmemcached::Instance* instance, const bool repl
 
   if (memcached_fatal(rc))
   {
-    fprintf(stderr, "%s\n", memcached_strerror(NULL, rc));
     assert(memcached_last_error(instance->root) != MEMCACHED_SUCCESS);
     *value= UINT64_MAX;
   }
+  else if (memcached_failed(rc))
+  {
+    *value= UINT64_MAX;
+  }
   else
   {
+    assert(memcached_last_error(instance->root) != MEMCACHED_NOTFOUND);
     *value= instance->root->result.numeric_value;
   }
 }
 
-static memcached_return_t text_incr_decr(org::libmemcached::Instance* instance,
+static memcached_return_t text_incr_decr(memcached_instance_st* instance,
                                          const bool is_incr,
                                          const char *key, size_t key_length,
                                          const uint64_t offset,
@@ -98,7 +102,7 @@ static memcached_return_t text_incr_decr(org::libmemcached::Instance* instance,
   return memcached_vdo(instance, vector, 7, true);
 }
 
-static memcached_return_t binary_incr_decr(org::libmemcached::Instance* instance,
+static memcached_return_t binary_incr_decr(memcached_instance_st* instance,
                                            protocol_binary_command cmd,
                                            const char *key, const size_t key_length,
                                            const uint64_t offset,
@@ -181,7 +185,7 @@ static memcached_return_t increment_decrement_by_key(const protocol_binary_comma
   }
 
   uint32_t server_key= memcached_generate_hash_with_redistribution(memc, group_key, group_key_length);
-  org::libmemcached::Instance* instance= memcached_instance_fetch(memc, server_key);
+  memcached_instance_st* instance= memcached_instance_fetch(memc, server_key);
 
   bool reply= memcached_is_replying(instance->root);
 
@@ -231,7 +235,7 @@ static memcached_return_t increment_decrement_with_initial_by_key(const protocol
   if (memcached_is_encrypted(memc))
   {
     return memcached_set_error(*memc, MEMCACHED_NOT_SUPPORTED, MEMCACHED_AT, 
-                               memcached_literal_param("Operation not allowed while encyrption is enabled"));
+                               memcached_literal_param("Operation not allowed while encryption is enabled"));
   }
 
   if (memcached_failed(rc= memcached_key_test(*memc, (const char **)&key, &key_length, 1)))
@@ -240,7 +244,7 @@ static memcached_return_t increment_decrement_with_initial_by_key(const protocol
   }
 
   uint32_t server_key= memcached_generate_hash_with_redistribution(memc, group_key, group_key_length);
-  org::libmemcached::Instance* instance= memcached_instance_fetch(memc, server_key);
+  memcached_instance_st* instance= memcached_instance_fetch(memc, server_key);
 
   bool reply= memcached_is_replying(instance->root);