Abstract out ptr->hosts[server_key] references.

[m6w6/libmemcached] / libmemcached / io.h

diff --git a/libmemcached/io.h b/libmemcached/io.h
index af51506593c71ada92eb20a3675e0f52c94aca1d..df7708c846c20461ceef81519f16a3e59b0d7df6 100644 (file)
--- a/libmemcached/io.h
+++ b/libmemcached/io.h
@@ -41,43 +41,37 @@ struct udp_datagram_header_st
 };
 
 LIBMEMCACHED_LOCAL
-ssize_t memcached_io_write(memcached_server_st *ptr,
+ssize_t memcached_io_write(memcached_server_instance_st *ptr,
                            const void *buffer, size_t length, char with_flush);
 
 LIBMEMCACHED_LOCAL
-void memcached_io_reset(memcached_server_st *ptr);
+void memcached_io_reset(memcached_server_instance_st *ptr);
 
 LIBMEMCACHED_LOCAL
-memcached_return_t memcached_io_read(memcached_server_st *ptr,
+memcached_return_t memcached_io_read(memcached_server_instance_st *ptr,
                                      void *buffer, size_t length, ssize_t *nread);
 
 /* Read a line (terminated by '\n') into the buffer */
 LIBMEMCACHED_LOCAL
-memcached_return_t memcached_io_readline(memcached_server_st *ptr,
+memcached_return_t memcached_io_readline(memcached_server_instance_st *ptr,
                                          char *buffer_ptr,
                                          size_t size);
 
 LIBMEMCACHED_LOCAL
-memcached_return_t memcached_io_close(memcached_server_st *ptr);
+memcached_return_t memcached_io_close(memcached_server_instance_st *ptr);
 
 /* Read n bytes of data from the server and store them in dta */
 LIBMEMCACHED_LOCAL
-memcached_return_t memcached_safe_read(memcached_server_st *ptr,
+memcached_return_t memcached_safe_read(memcached_server_instance_st *ptr,
                                        void *dta,
                                        size_t size);
 
-/* Read a single response from the server */
 LIBMEMCACHED_LOCAL
-memcached_return_t memcached_read_one_response(memcached_server_st *ptr,
-                                               char *buffer, size_t buffer_length,
-                                               memcached_result_st *result);
-
-LIBMEMCACHED_LOCAL
-memcached_return_t memcached_io_init_udp_header(memcached_server_st *ptr,
+memcached_return_t memcached_io_init_udp_header(memcached_server_instance_st *ptr,
                                                 uint16_t thread_id);
 
 LIBMEMCACHED_LOCAL
-memcached_server_st *memcached_io_get_readable_server(memcached_st *memc);
+memcached_server_instance_st *memcached_io_get_readable_server(memcached_st *memc);
 
 #endif /* BUILDING_LIBMEMCACHED */