X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstats.c;h=ff5416d4a5aef48a2c41d97d1e9af684b5021108;hb=0cc042d0d2b3e81eabc05600d1e4d26bf3d9691f;hp=0a0e4cc51a0e85a38c93645959360bc117d263fb;hpb=04ef974c23973986d4475e3cb8a876012264e2da;p=m6w6%2Flibmemcached

diff --git a/libmemcached/stats.c b/libmemcached/stats.c
index 0a0e4cc5..ff5416d4 100644
--- a/libmemcached/stats.c
+++ b/libmemcached/stats.c
@@ -161,7 +161,7 @@ static memcached_return_t set_data(memcached_stat_st *memc_stat, char *key, char
   return MEMCACHED_SUCCESS;
 }
 
-char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *memc_stat,
+char *memcached_stat_get_value(const memcached_st *ptr, memcached_stat_st *memc_stat,
                                const char *key, memcached_return_t *error)
 {
   char buffer[SMALL_STRING_LEN];
@@ -250,9 +250,13 @@ static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
     request.message.header.request.keylen= htons((uint16_t)len);
     request.message.header.request.bodylen= htonl((uint32_t) len);
 
-    if ((memcached_do(instance, request.bytes,
-                      sizeof(request.bytes), false) != MEMCACHED_SUCCESS) ||
-        (memcached_io_write(instance, args, len, true) == -1))
+    struct __write_vector_st vector[]= 
+    {
+      { .length= sizeof(request.bytes), .buffer= request.bytes },
+      { .length= len, .buffer= args }
+    }; 
+
+    if (memcached_vdo(instance, vector, 2, true) != MEMCACHED_SUCCESS)
     {
       memcached_io_reset(instance);
       return MEMCACHED_WRITE_FAILURE;
@@ -271,8 +275,8 @@ static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
   memcached_server_response_decrement(instance);
   do
   {
-    rc= memcached_response(instance, buffer,
-                           sizeof(buffer), NULL);
+    rc= memcached_response(instance, buffer, sizeof(buffer), NULL);
+
     if (rc == MEMCACHED_END)
       break;
 
@@ -413,6 +417,8 @@ memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char
   memcached_st *memc_ptr;
   memcached_server_write_instance_st instance;
 
+  memset(memc_stat, 0, sizeof(memcached_stat_st));
+
   memc_ptr= memcached_create(&memc);
   WATCHPOINT_ASSERT(memc_ptr);
 
@@ -438,7 +444,7 @@ memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char
   We make a copy of the keys since at some point in the not so distant future
   we will add support for "found" keys.
 */
-char ** memcached_stat_get_keys(memcached_st *ptr,
+char ** memcached_stat_get_keys(const memcached_st *ptr,
                                 memcached_stat_st *memc_stat,
                                 memcached_return_t *error)
 {
@@ -462,7 +468,7 @@ char ** memcached_stat_get_keys(memcached_st *ptr,
   return list;
 }
 
-void memcached_stat_free(memcached_st *ptr, memcached_stat_st *memc_stat)
+void memcached_stat_free(const memcached_st *ptr, memcached_stat_st *memc_stat)
 {
   if (memc_stat == NULL)
   {