X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.cc;h=f2f78211fe35beedb73ce138f64d4e950cf97677;hb=5aa178162af4134264e1c1e794e8b196bdd0d802;hp=2f41584419ad337d35d6c6b3572453b405b5506e;hpb=77eab04d2140f8e2bd904f7ac4a59b4eef54244f;p=m6w6%2Flibmemcached

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index 2f415844..f2f78211 100644
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -55,8 +55,9 @@ static inline void _server_init(memcached_server_st *self, memcached_st *root,
   self->server_failure_counter= 0;
   self->server_failure_counter_query_id= 0;
   self->weight= weight ? weight : 1; // 1 is the default weight value
-  WATCHPOINT_SET(self->io_wait_count.read= 0);
-  WATCHPOINT_SET(self->io_wait_count.write= 0);
+  self->io_wait_count.read= 0;
+  self->io_wait_count.write= 0;
+  self->io_wait_count.timeouts= 0;
   self->major_version= UINT8_MAX;
   self->micro_version= UINT8_MAX;
   self->minor_version= UINT8_MAX;
@@ -285,9 +286,9 @@ memcached_server_instance_st memcached_server_by_key(memcached_st *ptr,
     return NULL;
   }
 
-  if (memcached_failed(rc= (memcached_key_test(*ptr, (const char **)&key, &key_length, 1))))
+  if (memcached_failed((memcached_key_test(*ptr, (const char **)&key, &key_length, 1))))
   {
-    *error= rc;
+    *error= memcached_last_error(ptr);
     return NULL;
   }
 
@@ -310,8 +311,10 @@ void memcached_server_error_reset(memcached_server_st *self)
 memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *self)
 {
   WATCHPOINT_ASSERT(self);
-  if (not self)
+  if (self == NULL)
+  {
     return 0;
+  }
 
   return self->last_disconnected_server;
 }
@@ -319,8 +322,10 @@ memcached_server_instance_st memcached_server_get_last_disconnect(const memcache
 uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
 {
   WATCHPOINT_ASSERT(servers);
-  if (not servers)
+  if (servers == NULL)
+  {
     return 0;
+  }
 
   return servers->number_of_hosts= count;
 }
@@ -328,7 +333,7 @@ uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t coun
 uint32_t memcached_server_count(const memcached_st *self)
 {
   WATCHPOINT_ASSERT(self);
-  if (not self)
+  if (self == NULL)
     return 0;
 
   return self->number_of_hosts;
@@ -337,7 +342,7 @@ uint32_t memcached_server_count(const memcached_st *self)
 const char *memcached_server_name(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);
-  if (not self)
+  if (self == NULL)
     return NULL;
 
   return self->hostname;
@@ -346,7 +351,7 @@ const char *memcached_server_name(const memcached_server_instance_st self)
 in_port_t memcached_server_port(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);
-  if (not self)
+  if (self == NULL)
     return 0;
 
   return self->port;
@@ -355,7 +360,7 @@ in_port_t memcached_server_port(const memcached_server_instance_st self)
 uint32_t memcached_server_response_count(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);
-  if (not self)
+  if (self == NULL)
     return 0;
 
   return self->cursor_active;