Update free port logic.

[m6w6/libmemcached] / libmemcached / server.cc

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index f08f8bf077cdcc150ee98721dbcf3054e0beeac3..b742f7ef1695cde1da2fe736b7b12e0dc120e609 100644 (file)
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -139,7 +139,7 @@ memcached_server_st *__server_create_with(memcached_st *memc,
 
   if (memc)
   {
-    set_hostinfo(self);
+    memcached_connect_try(self);
   }
 
   return self;
@@ -241,18 +241,28 @@ memcached_return_t memcached_server_execute(memcached_st *ptr,
                                             memcached_server_execute_fn callback,
                                             void *context)
 {
+  if (callback == NULL)
+  {
+    return MEMCACHED_INVALID_ARGUMENTS;
+  }
+
+  bool some_errors= false;;
   for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
   {
     memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, x);
 
-    unsigned int iferror= (*callback)(ptr, instance, context);
-
-    if (iferror)
+    memcached_return_t rc= (*callback)(ptr, instance, context);
+    if (rc == MEMCACHED_INVALID_ARGUMENTS)
     {
-      continue;
+      return rc;
+    }
+    else if (memcached_fatal(rc))
+    {
+      some_errors= true;
     }
   }
 
+  (void)some_errors;
   return MEMCACHED_SUCCESS;
 }
 
@@ -275,15 +285,9 @@ 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)))
-  {
-    *error= rc;
-    return NULL;
-  }
-
   if (memcached_failed((memcached_key_test(*ptr, (const char **)&key, &key_length, 1))))
   {
-    *error= MEMCACHED_BAD_KEY_PROVIDED;
+    *error= memcached_last_error(ptr);
     return NULL;
   }
 
@@ -295,7 +299,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;
   }