Merge in trunk

[m6w6/libmemcached] / libmemcached / dump.cc

diff --git a/libmemcached/dump.cc b/libmemcached/dump.cc
index 5ba4ce1624c185c6b8e5b8c858fa498c84d512b5..05b4e5d6c8cf4b81fd50d6dcf5725dc5aa7c511f 100644 (file)
--- a/libmemcached/dump.cc
+++ b/libmemcached/dump.cc
@@ -61,7 +61,7 @@ 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") }
     };
 
@@ -77,7 +77,7 @@ 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;
       }
     }
 
@@ -128,7 +128,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;
       }
     }
   }