Merge up current work from trunk

[awesomized/libmemcached] / libmemcached / verbosity.cc

diff --git a/libmemcached/verbosity.cc b/libmemcached/verbosity.cc
index ec00b8dedc26af329344d0a5380582ea8f482487..5564c7a90f7b894cb88b8349749daf9ddcbd40fa 100644 (file)
--- a/libmemcached/verbosity.cc
+++ b/libmemcached/verbosity.cc
@@ -43,26 +43,23 @@ struct context_st
   const char *buffer;
 };
 
-static memcached_return_t _set_verbosity(const memcached_st *ptr,
+static memcached_return_t _set_verbosity(const memcached_st *,
                                          const memcached_server_st *server,
                                          void *context)
 {
-  memcached_return_t rc;
-  memcached_st local_memc;
-  memcached_st *memc_ptr;
-  char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
-
   struct context_st *execute= (struct context_st *)context;
-  (void)ptr;
 
-  memc_ptr= memcached_create(&local_memc);
+  memcached_st local_memc;
+  memcached_st *memc_ptr= memcached_create(&local_memc);
 
-  rc= memcached_server_add(memc_ptr, memcached_server_name(server), memcached_server_port(server));
+  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);
+    char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+
+    memcached_server_write_instance_st instance= memcached_server_instance_fetch(memc_ptr, 0);
+
 
     rc= memcached_do(instance, execute->buffer, execute->length, true);
 
@@ -87,7 +84,10 @@ memcached_return_t memcached_verbosity(memcached_st *ptr, uint32_t verbosity)
   send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
                                  "verbosity %u\r\n", verbosity);
   if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || send_length < 0)
-    return MEMCACHED_WRITE_FAILURE;
+  {
+    return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, 
+                               memcached_literal_param("snprintf(MEMCACHED_DEFAULT_COMMAND_SIZE)"));
+  }
 
   struct context_st context = { (size_t)send_length, buffer };