X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fcommon.h;h=3c707143e9bbdc9bc275448300c0c3941f4d04cd;hb=347434b799ba94bd621df9a1d277ff8a36157f21;hp=c87beb60810ff5ad968da226c4a6144ba0e44ea2;hpb=15db4f3f26e02d62e8cd769391e73cb57089aa1c;p=m6w6%2Flibmemcached

diff --git a/lib/common.h b/lib/common.h
index c87beb60..3c707143 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -73,17 +73,16 @@ uint32_t hash_crc32(const char *data,
                     size_t data_len);
 uint32_t hsieh_hash(char *key, size_t key_length);
 
-memcached_return memcached_connect(memcached_st *ptr, unsigned int server_key);
-memcached_return memcached_response(memcached_st *ptr, 
+memcached_return memcached_connect(memcached_server_st *ptr);
+memcached_return memcached_response(memcached_server_st *ptr, 
                                     char *buffer, size_t buffer_length,
-                                    memcached_result_st *result,
-                                    unsigned int server_key);
+                                    memcached_result_st *result);
 unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_length);
-void memcached_quit_server(memcached_st *ptr, unsigned int server_key, uint8_t io_death);
+void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death);
 
-#define memcached_server_response_increment(A,B) A->hosts[B].cursor_active++
-#define memcached_server_response_decrement(A,B) A->hosts[B].cursor_active--
-#define memcached_server_response_reset(A,B) A->hosts[B].cursor_active=0
+#define memcached_server_response_increment(A) (A)->cursor_active++
+#define memcached_server_response_decrement(A) (A)->cursor_active--
+#define memcached_server_response_reset(A) (A)->cursor_active=0
 
 /* String Struct */
 #define memcached_string_length(A) (size_t)((A)->end - (A)->string)
@@ -103,13 +102,12 @@ memcached_return memcached_string_append(memcached_string_st *string,
 size_t memcached_string_backspace(memcached_string_st *string, size_t remove);
 memcached_return memcached_string_reset(memcached_string_st *string);
 void memcached_string_free(memcached_string_st *string);
-memcached_return memcached_do(memcached_st *ptr, unsigned int server_key, char *commmand, 
-                              size_t command_length, char with_flush);
+memcached_return memcached_do(memcached_server_st *ptr, char *commmand, 
+                              size_t command_length, uint8_t with_flush);
 memcached_return memcached_version(memcached_st *ptr);
-memcached_return value_fetch(memcached_st *ptr,
+memcached_return value_fetch(memcached_server_st *ptr,
                              char *buffer,
-                             memcached_result_st *result,
-                             unsigned int server_key);
+                             memcached_result_st *result);
 void server_list_free(memcached_st *ptr, memcached_server_st *servers);