Merge from trunk.

[m6w6/libmemcached] / libmemcached / server.h

diff --git a/libmemcached/server.h b/libmemcached/server.h
index 425dfb01606892c347febbace178d2c47cbfab09..a45616a1010109f2f814f8682381e0dba98514f0 100644 (file)
--- 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];
@@ -159,13 +158,12 @@ const char *memcached_server_name(memcached_server_instance_st self);
 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);
-
 LIBMEMCACHED_API
 const char *memcached_server_type(memcached_server_instance_st ptr);
 
 
+LIBMEMCACHED_LOCAL
+void __server_free(memcached_server_st *);
 
 #ifdef __cplusplus
 } // extern "C"