Abstract out ptr->hosts[server_key] references.

[m6w6/libmemcached] / libmemcached / io.c

diff --git a/libmemcached/io.c b/libmemcached/io.c
index 6d19c672da79f5414562847111716b3bfb512b98..793075a51f6d7647ea9581d673182185c8dbf4a6 100644 (file)
--- a/libmemcached/io.c
+++ b/libmemcached/io.c
@@ -19,10 +19,10 @@ typedef enum {
   MEM_WRITE
 } memc_read_or_write;
 
-static ssize_t io_flush(memcached_server_st *ptr, memcached_return_t *error);
-static void increment_udp_message_id(memcached_server_st *ptr);
+static ssize_t io_flush(memcached_server_instance_st *ptr, memcached_return_t *error);
+static void increment_udp_message_id(memcached_server_instance_st *ptr);
 
-static memcached_return_t io_wait(memcached_server_st *ptr,
+static memcached_return_t io_wait(memcached_server_instance_st *ptr,
                                   memc_read_or_write read_or_write)
 {
   struct pollfd fds= {
@@ -73,7 +73,7 @@ static memcached_return_t io_wait(memcached_server_st *ptr,
  *
  * @param ptr the server to pack
  */
-static bool repack_input_buffer(memcached_server_st *ptr)
+static bool repack_input_buffer(memcached_server_instance_st *ptr)
 {
   if (ptr->read_ptr != ptr->read_buffer)
   {
@@ -113,7 +113,7 @@ static bool repack_input_buffer(memcached_server_st *ptr)
  * @param ptr the server to star processing iput messages for
  * @return true if we processed anything, false otherwise
  */
-static bool process_input_buffer(memcached_server_st *ptr)
+static bool process_input_buffer(memcached_server_instance_st *ptr)
 {
   /*
    ** We might be able to process some of the response messages if we
@@ -176,7 +176,7 @@ void memcached_io_preread(memcached_st *ptr)
 }
 #endif
 
-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)
 {
   char *buffer_ptr;
@@ -264,7 +264,7 @@ memcached_return_t memcached_io_read(memcached_server_st *ptr,
   return MEMCACHED_SUCCESS;
 }
 
-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)
 {
   size_t original_length;
@@ -331,7 +331,7 @@ ssize_t memcached_io_write(memcached_server_st *ptr,
   return (ssize_t) original_length;
 }
 
-memcached_return_t memcached_io_close(memcached_server_st *ptr)
+memcached_return_t memcached_io_close(memcached_server_instance_st *ptr)
 {
   if (ptr->fd == -1)
   {
@@ -354,7 +354,7 @@ memcached_return_t memcached_io_close(memcached_server_st *ptr)
   return MEMCACHED_SUCCESS;
 }
 
-memcached_server_st *memcached_io_get_readable_server(memcached_st *memc)
+memcached_server_instance_st *memcached_io_get_readable_server(memcached_st *memc)
 {
 #define MAX_SERVERS_TO_POLL 100
   struct pollfd fds[MAX_SERVERS_TO_POLL];
@@ -410,7 +410,7 @@ memcached_server_st *memcached_io_get_readable_server(memcached_st *memc)
   return NULL;
 }
 
-static ssize_t io_flush(memcached_server_st *ptr,
+static ssize_t io_flush(memcached_server_instance_st *ptr,
                         memcached_return_t *error)
 {
   /*
@@ -526,7 +526,7 @@ static ssize_t io_flush(memcached_server_st *ptr,
 /*
   Eventually we will just kill off the server with the problem.
 */
-void memcached_io_reset(memcached_server_st *ptr)
+void memcached_io_reset(memcached_server_instance_st *ptr)
 {
   memcached_quit_server(ptr, 1);
 }
@@ -535,7 +535,7 @@ void memcached_io_reset(memcached_server_st *ptr)
  * Read a given number of bytes from the server and place it into a specific
  * buffer. Reset the IO channel on this server if an error occurs.
  */
-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)
 {
@@ -556,7 +556,7 @@ memcached_return_t memcached_safe_read(memcached_server_st *ptr,
   return MEMCACHED_SUCCESS;
 }
 
-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)
 {
@@ -614,7 +614,7 @@ memcached_return_t memcached_io_readline(memcached_server_st *ptr,
  * extracts the message number from message_id, increments it and then
  * writes the new value back into the header
  */
-static void increment_udp_message_id(memcached_server_st *ptr)
+static void increment_udp_message_id(memcached_server_instance_st *ptr)
 {
   struct udp_datagram_header_st *header= (struct udp_datagram_header_st *)ptr->write_buffer;
   uint16_t cur_req= get_udp_datagram_request_id(header);
@@ -627,7 +627,7 @@ static void increment_udp_message_id(memcached_server_st *ptr)
   header->request_id= htons((uint16_t) (thread_id | msg_num));
 }
 
-memcached_return_t memcached_io_init_udp_header(memcached_server_st *ptr, uint16_t thread_id)
+memcached_return_t memcached_io_init_udp_header(memcached_server_instance_st *ptr, uint16_t thread_id)
 {
   if (thread_id > UDP_REQUEST_ID_MAX_THREAD_ID)
     return MEMCACHED_FAILURE;