Merge in Changelog

[m6w6/libmemcached] / libmemcached / do.cc

diff --git a/libmemcached/do.cc b/libmemcached/do.cc
index 14824a641aec79c659c8fbdc8f94ae912894f176..5e9e65f280e20b314f89e8727b9a13b46829b276 100644 (file)
--- a/libmemcached/do.cc
+++ b/libmemcached/do.cc
@@ -9,7 +9,7 @@
  *
  */
 
-#include "common.h"
+#include <libmemcached/common.h>
 
 memcached_return_t memcached_do(memcached_server_write_instance_st ptr, const void *command,
                                 size_t command_length, bool with_flush)
@@ -20,8 +20,9 @@ memcached_return_t memcached_do(memcached_server_write_instance_st ptr, const vo
   WATCHPOINT_ASSERT(command_length);
   WATCHPOINT_ASSERT(command);
 
-  if ((rc= memcached_connect(ptr)) != MEMCACHED_SUCCESS)
+  if (memcached_failed(rc= memcached_connect(ptr)))
   {
+    WATCHPOINT_ASSERT(rc == memcached_last_error(ptr->root));
     WATCHPOINT_ERROR(rc);
     return rc;
   }
@@ -60,9 +61,10 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
   WATCHPOINT_ASSERT(count);
   WATCHPOINT_ASSERT(vector);
 
-  if ((rc= memcached_connect(ptr)) != MEMCACHED_SUCCESS)
+  if (memcached_failed(rc= memcached_connect(ptr)))
   {
     WATCHPOINT_ERROR(rc);
+    assert_msg(ptr->error_messages, "memcached_connect() returned an error but the memcached_server_write_instance_st showed none.");
     return rc;
   }
 
@@ -84,7 +86,7 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
     command_length+= vector->length;
   }
 
-  if (sent_length == -1 || (size_t)sent_length != command_length)
+  if (sent_length == -1 or size_t(sent_length) != command_length)
   {
     rc= MEMCACHED_WRITE_FAILURE;
     WATCHPOINT_ERROR(rc);