Fix issue where hash might not be quite initialized. Also remove redundant bit to...

[awesomized/libmemcached] / libmemcached / server.h

diff --git a/libmemcached/server.h b/libmemcached/server.h
index aadd690fe0714e1b72e77b1081c4827ed074ca46..fd731e0e1445d4b52ec4125b032bfbb2e3879c52 100644 (file)
--- a/libmemcached/server.h
+++ b/libmemcached/server.h
@@ -17,8 +17,8 @@ struct memcached_server_st {
   struct {
     bool is_allocated:1;
     bool is_initialized:1;
-    bool sockaddr_inited:1;
     bool is_shutting_down:1;
+    bool is_dead:1;
   } options;
   uint32_t number_of_hosts;
   uint32_t cursor_active;
@@ -28,10 +28,6 @@ struct memcached_server_st {
   uint32_t io_bytes_sent; /* # bytes sent since last read */
   uint32_t server_failure_counter;
   uint32_t weight;
-  struct { // Place any "state" sort variables in here.
-    bool is_corked:1;
-    bool is_dead:1;
-  } state;
   struct {
     uint32_t read;
     uint32_t write;
@@ -46,6 +42,7 @@ struct memcached_server_st {
   size_t read_data_length;
   size_t write_buffer_offset;
   struct addrinfo *address_info;
+  struct addrinfo *address_info_next;
   time_t next_retry;
   const memcached_st *root;
   uint64_t limit_maxbytes;
@@ -96,13 +93,6 @@ LIBMEMCACHED_API
 memcached_return_t memcached_server_add(memcached_st *ptr,
                                         const char *hostname, in_port_t port);
 
-LIBMEMCACHED_LOCAL
-  memcached_return_t memcached_server_add_parsed(memcached_st *ptr,
-                                                 const char *hostname,
-                                                 size_t hostname_length,
-                                                 in_port_t port,
-                                                 uint32_t weight);
-
 LIBMEMCACHED_API
 memcached_return_t memcached_server_add_udp_with_weight(memcached_st *ptr,
                                                         const char *hostname,