Import/Merge of libtest latest.

[m6w6/libmemcached] / libmemcached / io.hpp

diff --git a/libmemcached/io.hpp b/libmemcached/io.hpp
index af18fe3ad04bdfa0b2c1e9a56c0c0426c850f7b1..bff6b83db205ae8edc6b638e48eb9ff0c035c1f6 100644 (file)
--- a/libmemcached/io.hpp
+++ b/libmemcached/io.hpp
@@ -38,23 +38,23 @@
 
 #pragma once
 
-size_t io_vector_total_size(libmemcached_io_vector_st* vector, const size_t number_of);
+void initialize_binary_request(memcached_server_write_instance_st server, protocol_binary_request_header&);
 
 bool memcached_io_write(memcached_server_write_instance_st ptr);
 
 ssize_t memcached_io_write(memcached_server_write_instance_st ptr,
                            const void *buffer, size_t length, bool with_flush);
 
-ssize_t memcached_io_writev(memcached_server_write_instance_st ptr,
-                            const struct libmemcached_io_vector_st *vector,
-                            size_t number_of, bool with_flush);
+bool memcached_io_writev(memcached_server_write_instance_st ptr,
+                         libmemcached_io_vector_st vector[],
+                         const size_t number_of, const bool with_flush);
 
 memcached_return_t memcached_io_wait_for_write(memcached_server_write_instance_st ptr);
 
 void memcached_io_reset(memcached_server_write_instance_st ptr);
 
 memcached_return_t memcached_io_read(memcached_server_write_instance_st ptr,
-                                     void *buffer, size_t length, ssize_t *nread);
+                                     void *buffer, size_t length, ssize_t& nread);
 
 /* Read a line (terminated by '\n') into the buffer */
 memcached_return_t memcached_io_readline(memcached_server_write_instance_st ptr,
@@ -67,10 +67,7 @@ void memcached_io_close(memcached_server_write_instance_st ptr);
 /* Read n bytes of data from the server and store them in dta */
 memcached_return_t memcached_safe_read(memcached_server_write_instance_st ptr,
                                        void *dta,
-                                       size_t size);
-
-memcached_return_t memcached_io_init_udp_header(memcached_server_write_instance_st ptr,
-                                                uint16_t thread_id);
+                                       const size_t size);
 
 memcached_server_write_instance_st memcached_io_get_readable_server(memcached_st *memc);