*
*/
-#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)
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;
}
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;
}
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);