First merge of Trond's patches (cherry picking).

[m6w6/libmemcached] / libmemcached / memcached_dump.c

diff --git a/libmemcached/memcached_dump.c b/libmemcached/memcached_dump.c
index 5872aa40de4b9f953d1ff7492553fa8c4e1605d4..4c1006e784cd6d46dfb636ac126dd1836d65758b 100644 (file)
--- a/libmemcached/memcached_dump.c
+++ b/libmemcached/memcached_dump.c
@@ -7,9 +7,9 @@
 */
 
 #include "common.h"
-static memcached_return ascii_dump(memcached_st *ptr, memcached_dump_func *callback, void *context, uint32_t number_of_callbacks)
+static memcached_return_t ascii_dump(memcached_st *ptr, memcached_dump_fn *callback, void *context, uint32_t number_of_callbacks)
 {
-  memcached_return rc= 0;
+  memcached_return_t rc= 0;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   size_t send_length;
   uint32_t server_key;
@@ -80,10 +80,10 @@ error:
     return rc;
 }
 
-memcached_return memcached_dump(memcached_st *ptr, memcached_dump_func *callback, void *context, uint32_t number_of_callbacks)
+memcached_return_t memcached_dump(memcached_st *ptr, memcached_dump_fn *callback, void *context, uint32_t number_of_callbacks)
 {
   /* No support for Binary protocol yet */
-  if (ptr->flags & MEM_BINARY_PROTOCOL)
+  if (ptr->flags.binary_protocol)
     return MEMCACHED_FAILURE;
 
   return ascii_dump(ptr, callback, context, number_of_callbacks);