More memcached_dump()

[m6w6/libmemcached] / libmemcached / server.cc

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index f08f8bf077cdcc150ee98721dbcf3054e0beeac3..85ce83810299babdc1c21ab44eb00c59f2230feb 100644 (file)
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -275,18 +275,12 @@ memcached_server_instance_st memcached_server_by_key(memcached_st *ptr,
     return NULL;
   }
 
-  if (memcached_failed(rc= memcached_validate_key_length(key_length, ptr->flags.binary_protocol)))
+  if (memcached_failed(rc= (memcached_key_test(*ptr, (const char **)&key, &key_length, 1))))
   {
     *error= rc;
     return NULL;
   }
 
-  if (memcached_failed((memcached_key_test(*ptr, (const char **)&key, &key_length, 1))))
-  {
-    *error= MEMCACHED_BAD_KEY_PROVIDED;
-    return NULL;
-  }
-
   uint32_t server_key= memcached_generate_hash(ptr, key, key_length);
   return memcached_server_instance_by_position(ptr, server_key);
 
@@ -295,7 +289,7 @@ memcached_server_instance_st memcached_server_by_key(memcached_st *ptr,
 void memcached_server_error_reset(memcached_server_st *self)
 {
   WATCHPOINT_ASSERT(self);
-  if (not self)
+  if (self == NULL)
   {
     return;
   }