X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fdump.cc;h=8ddb2eef859e7a442273510c74457f3f6c3b8037;hb=95474a1687017de0adb2c6ce57c1ab7c0704c5c6;hp=5ba4ce1624c185c6b8e5b8c858fa498c84d512b5;hpb=ef3cb20e2967fc17cf7f1c5b6eb14e84bc88a7dc;p=awesomized%2Flibmemcached

diff --git a/libmemcached/dump.cc b/libmemcached/dump.cc
index 5ba4ce16..8ddb2eef 100644
--- a/libmemcached/dump.cc
+++ b/libmemcached/dump.cc
@@ -44,7 +44,7 @@
 
 #include <libmemcached/common.h>
 
-static memcached_return_t ascii_dump(memcached_st *memc, memcached_dump_fn *callback, void *context, uint32_t number_of_callbacks)
+static memcached_return_t ascii_dump(Memcached *memc, memcached_dump_fn *callback, void *context, uint32_t number_of_callbacks)
 {
   /* MAX_NUMBER_OF_SLAB_CLASSES is defined to 200 in Memcached 1.4.10 */
   for (uint32_t x= 0; x < 200; x++)
@@ -61,14 +61,14 @@ static memcached_return_t ascii_dump(memcached_st *memc, memcached_dump_fn *call
     libmemcached_io_vector_st vector[]=
     {
       { memcached_literal_param("stats cachedump ") },
-      { buffer, buffer_length },
+      { buffer, size_t(buffer_length) },
       { memcached_literal_param(" 0\r\n") }
     };
 
     // Send message to all servers
     for (uint32_t server_key= 0; server_key < memcached_server_count(memc); server_key++)
     {
-      memcached_server_write_instance_st instance= memcached_server_instance_fetch(memc, server_key);
+      memcached_instance_st* instance= memcached_instance_fetch(memc, server_key);
 
       memcached_return_t vdo_rc;
       if (memcached_success((vdo_rc= memcached_vdo(instance, vector, 3, true))))
@@ -77,13 +77,14 @@ static memcached_return_t ascii_dump(memcached_st *memc, memcached_dump_fn *call
       }
       else
       {
-        return memcached_set_error(*instance, vdo_rc, MEMCACHED_AT);
+        return vdo_rc;
       }
     }
 
     // Collect the returned items
-    memcached_server_write_instance_st instance;
-    while ((instance= memcached_io_get_readable_server(memc)))
+    memcached_instance_st* instance;
+    memcached_return_t read_ret= MEMCACHED_SUCCESS;
+    while ((instance= memcached_io_get_readable_server(memc, read_ret)))
     {
       memcached_return_t response_rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
       if (response_rc == MEMCACHED_ITEM)
@@ -128,7 +129,7 @@ static memcached_return_t ascii_dump(memcached_st *memc, memcached_dump_fn *call
       else
       {
         // IO error of some sort must have occurred
-        return memcached_set_error(*instance, response_rc, MEMCACHED_AT);
+        return response_rc;
       }
     }
   }
@@ -136,8 +137,9 @@ static memcached_return_t ascii_dump(memcached_st *memc, memcached_dump_fn *call
   return memcached_has_current_error(*memc) ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
 }
 
-memcached_return_t memcached_dump(memcached_st *ptr, memcached_dump_fn *callback, void *context, uint32_t number_of_callbacks)
+memcached_return_t memcached_dump(memcached_st *shell, memcached_dump_fn *callback, void *context, uint32_t number_of_callbacks)
 {
+  Memcached* ptr= memcached2Memcached(shell);
   memcached_return_t rc;
   if (memcached_failed(rc= initialize_query(ptr, true)))
   {