projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge trunk
[awesomized/libmemcached]
/
libmemcached
/
do.cc
diff --git
a/libmemcached/do.cc
b/libmemcached/do.cc
index 854c611497c36b60a2286450cbb2b05f75861a54..5e9e65f280e20b314f89e8727b9a13b46829b276 100644
(file)
--- a/
libmemcached/do.cc
+++ b/
libmemcached/do.cc
@@
-61,9
+61,10
@@
memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
WATCHPOINT_ASSERT(count);
WATCHPOINT_ASSERT(vector);
WATCHPOINT_ASSERT(count);
WATCHPOINT_ASSERT(vector);
- if (
(rc= memcached_connect(ptr)) != MEMCACHED_SUCCESS
)
+ if (
memcached_failed(rc= memcached_connect(ptr))
)
{
WATCHPOINT_ERROR(rc);
{
WATCHPOINT_ERROR(rc);
+ assert_msg(ptr->error_messages, "memcached_connect() returned an error but the memcached_server_write_instance_st showed none.");
return rc;
}
return rc;
}
@@
-85,7
+86,7
@@
memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
command_length+= vector->length;
}
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);
{
rc= MEMCACHED_WRITE_FAILURE;
WATCHPOINT_ERROR(rc);