X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.h;h=a45616a1010109f2f814f8682381e0dba98514f0;hb=609d07c5a051c301ce6595747c2f64d3819554f5;hp=d5b5684f5fb1b703aba0ca19e6a28a91b6e7f5dd;hpb=276e5c1e7fefa8f7061270f79443a704231c819e;p=m6w6%2Flibmemcached

diff --git a/libmemcached/server.h b/libmemcached/server.h
index d5b5684f..a45616a1 100644
--- a/libmemcached/server.h
+++ b/libmemcached/server.h
@@ -55,7 +55,6 @@ struct memcached_server_st {
   uint32_t number_of_hosts;
   uint32_t cursor_active;
   in_port_t port;
-  int cached_errno;
   memcached_socket_t fd;
   uint32_t io_bytes_sent; /* # bytes sent since last read */
   uint32_t server_failure_counter;
@@ -70,7 +69,6 @@ struct memcached_server_st {
   uint8_t minor_version; // ditto
   memcached_connection_t type;
   char *read_ptr;
-  char *cached_server_error;
   size_t read_buffer_length;
   size_t read_data_length;
   size_t write_buffer_offset;
@@ -79,6 +77,7 @@ struct memcached_server_st {
   time_t next_retry;
   memcached_st *root;
   uint64_t limit_maxbytes;
+  struct memcached_error_t *error_messages;
   char read_buffer[MEMCACHED_MAX_BUFFER];
   char write_buffer[MEMCACHED_MAX_BUFFER];
   char hostname[NI_MAXHOST];
@@ -126,6 +125,13 @@ 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,
@@ -153,9 +159,11 @@ LIBMEMCACHED_API
 in_port_t memcached_server_port(memcached_server_instance_st self);
 
 LIBMEMCACHED_API
-const char *memcached_server_error(memcached_server_instance_st ptr);
+const char *memcached_server_type(memcached_server_instance_st ptr);
 
 
+LIBMEMCACHED_LOCAL
+void __server_free(memcached_server_st *);
 
 #ifdef __cplusplus
 } // extern "C"