cmake

[m6w6/libmemcached] / libmemcached / verbosity.cc

diff --git a/libmemcached/verbosity.cc b/libmemcached/verbosity.cc
index 39810decc7c5c67f6777d647852cc74aeb938847..43d7374428fcfec0ad450ccf5398ee9ded24dab7 100644 (file)
--- a/libmemcached/verbosity.cc
+++ b/libmemcached/verbosity.cc
@@ -43,23 +43,22 @@ struct context_st
   const char *buffer;
 };
 
-static memcached_return_t _set_verbosity(const memcached_st *,
-                                         const memcached_server_instance_st server,
+static memcached_return_t _set_verbosity(const Memcached *,
+                                         const memcached_instance_st * server,
                                          void *context)
 {
  libmemcached_io_vector_st *vector= (libmemcached_io_vector_st *)context;
 
-  memcached_st local_memc;
-  memcached_st *memc_ptr= memcached_create(&local_memc);
+  Memcached local_memc;
+  Memcached *memc_ptr= memcached_create(&local_memc);
 
   memcached_return_t rc= memcached_server_add(memc_ptr, memcached_server_name(server), memcached_server_port(server));
 
   if (rc == MEMCACHED_SUCCESS)
   {
-    memcached_server_write_instance_st instance= memcached_server_instance_fetch(memc_ptr, 0);
+    memcached_instance_st* instance= memcached_instance_fetch(memc_ptr, 0);
 
-
-    rc= memcached_vdo(instance, vector, 4, true);
+    rc= memcached_vdo(instance, vector, 2, true);
 
     if (rc == MEMCACHED_SUCCESS)
     {
@@ -73,8 +72,9 @@ static memcached_return_t _set_verbosity(const memcached_st *,
   return rc;
 }
 
-memcached_return_t memcached_verbosity(memcached_st *ptr, uint32_t verbosity)
+memcached_return_t memcached_verbosity(memcached_st *shell, uint32_t verbosity)
 {
+  Memcached* ptr= memcached2Memcached(shell);
   memcached_return_t rc;
   if (memcached_failed(rc= initialize_query(ptr, false)))
   {
@@ -85,7 +85,7 @@ memcached_return_t memcached_verbosity(memcached_st *ptr, uint32_t verbosity)
 
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
 
-  int send_length= snprintf(buffer, sizeof(buffer), "%u", verbosity);
+  int send_length= snprintf(buffer, sizeof(buffer), "verbosity %u\r\n", verbosity);
   if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE or send_length < 0)
   {
     return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, 
@@ -95,9 +95,7 @@ memcached_return_t memcached_verbosity(memcached_st *ptr, uint32_t verbosity)
   libmemcached_io_vector_st vector[]=
   {
     { NULL, 0 },
-    { memcached_literal_param("verbosity ") },
-    { buffer, send_length },
-    { memcached_literal_param("\r\n") }
+    { buffer, size_t(send_length) },
   };
 
   callbacks[0]= _set_verbosity;