X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fio.h;h=6d3e2fa248831f4c7bceec1d6d9302eb0e475a16;hb=c3136bce4decf4259ebb60ea2425b47017ad7bb1;hp=0d1e6193c3839945b7a0c1a4981229698f28d920;hpb=625e84ebfc422790372bc2984f504bdcb4da779c;p=awesomized%2Flibmemcached

diff --git a/libmemcached/io.h b/libmemcached/io.h
index 0d1e6193..6d3e2fa2 100644
--- a/libmemcached/io.h
+++ b/libmemcached/io.h
@@ -38,8 +38,6 @@
 
 #pragma once
 
-#include <libmemcached/memcached.h>
-
 #define MAX_UDP_DATAGRAM_LENGTH 1400
 #define UDP_DATAGRAM_HEADER_LENGTH 8
 #define UDP_REQUEST_ID_MSG_SIG_DIGITS 10
@@ -62,8 +60,8 @@ struct udp_datagram_header_st
 
 struct libmemcached_io_vector_st
 {
-  size_t length;
   const void *buffer;
+  size_t length;
 };
 
 #ifdef __cplusplus
@@ -71,49 +69,14 @@ extern "C" {
 #endif
 
 LIBMEMCACHED_LOCAL
-memcached_return_t memcached_io_wait_for_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);
 
 LIBMEMCACHED_LOCAL
 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);
 
-LIBMEMCACHED_LOCAL
-ssize_t memcached_io_write(memcached_server_write_instance_st ptr,
-                           const void *buffer, size_t length, bool with_flush);
-
-LIBMEMCACHED_LOCAL
-void memcached_io_reset(memcached_server_write_instance_st ptr);
-
-LIBMEMCACHED_LOCAL
-memcached_return_t memcached_io_read(memcached_server_write_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_write_instance_st ptr,
-                                         char *buffer_ptr,
-                                         size_t size);
-
-LIBMEMCACHED_LOCAL
-void memcached_io_close(memcached_server_write_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_write_instance_st ptr,
-                                       void *dta,
-                                       size_t size);
-
-LIBMEMCACHED_LOCAL
-memcached_return_t memcached_io_init_udp_header(memcached_server_write_instance_st ptr,
-                                                uint16_t thread_id);
-
-LIBMEMCACHED_LOCAL
-memcached_server_write_instance_st memcached_io_get_readable_server(memcached_st *memc);
-
-LIBMEMCACHED_LOCAL
-memcached_return_t memcached_io_slurp(memcached_server_write_instance_st ptr);
-
 #ifdef __cplusplus
 }
 #endif