X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fio.h;h=ca22c27d34c5018cce604e6d5e7c5235765a1d17;hb=70c3fdd7d6d441a8be3e831f6a0aa3ae88166bc6;hp=af51506593c71ada92eb20a3675e0f52c94aca1d;hpb=0b0a30bb53359a9aff8afff1a45209c4be7b8881;p=m6w6%2Flibmemcached

diff --git a/libmemcached/io.h b/libmemcached/io.h
index af515065..ca22c27d 100644
--- a/libmemcached/io.h
+++ b/libmemcached/io.h
@@ -9,17 +9,17 @@
  *
  */
 
-#ifndef LIBMEMCACHED_MEMCACHED_IO_H
-#define LIBMEMCACHED_MEMCACHED_IO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __LIBMEMCACHED_IO_H__
+#define __LIBMEMCACHED_IO_H__
 
 #if defined(BUILDING_LIBMEMCACHED)
 
 #include "libmemcached/memcached.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MAX_UDP_DATAGRAM_LENGTH 1400
 #define UDP_DATAGRAM_HEADER_LENGTH 8
 #define UDP_REQUEST_ID_MSG_SIG_DIGITS 10
@@ -41,48 +41,42 @@ struct udp_datagram_header_st
 };
 
 LIBMEMCACHED_LOCAL
-ssize_t memcached_io_write(memcached_server_st *ptr,
-                           const void *buffer, size_t length, char with_flush);
+ssize_t memcached_io_write(memcached_server_instance_st *ptr,
+                           const void *buffer, size_t length, bool 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);
-
-#endif /* BUILDING_LIBMEMCACHED */
+memcached_server_instance_st *memcached_io_get_readable_server(memcached_st *memc);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* LIBMEMCACHED_MEMCACHED_IO_H */
+#endif /* BUILDING_LIBMEMCACHED */
+
+#endif /* __LIBMEMCACHED_IO_H__ */