projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in bug fix for 456080.
[m6w6/libmemcached]
/
libmemcached
/
do.c
diff --git
a/libmemcached/do.c
b/libmemcached/do.c
index 794303a89383f1ace1706bcb980c3978e8e0b292..14824a641aec79c659c8fbdc8f94ae912894f176 100644
(file)
--- a/
libmemcached/do.c
+++ b/
libmemcached/do.c
@@
-5,13
+5,13
@@
* Use and distribution licensed under the BSD license. See
* the COPYING file in the parent directory for full text.
*
* Use and distribution licensed under the BSD license. See
* the COPYING file in the parent directory for full text.
*
- * Summary:
+ * Summary:
*
*/
#include "common.h"
*
*/
#include "common.h"
-memcached_return_t memcached_do(memcached_server_write_instance_st ptr, const void *command,
+memcached_return_t memcached_do(memcached_server_write_instance_st ptr, const void *command,
size_t command_length, bool with_flush)
{
memcached_return_t rc;
size_t command_length, bool with_flush)
{
memcached_return_t rc;
@@
-51,7
+51,7
@@
memcached_return_t memcached_do(memcached_server_write_instance_st ptr, const vo
}
memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
}
memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
- const struct
__write
_vector_st *vector, size_t count,
+ const struct
libmemcached_io
_vector_st *vector, size_t count,
bool with_flush)
{
memcached_return_t rc;
bool with_flush)
{
memcached_return_t rc;
@@
-87,6
+87,8
@@
memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
if (sent_length == -1 || (size_t)sent_length != command_length)
{
rc= MEMCACHED_WRITE_FAILURE;
if (sent_length == -1 || (size_t)sent_length != command_length)
{
rc= MEMCACHED_WRITE_FAILURE;
+ WATCHPOINT_ERROR(rc);
+ WATCHPOINT_ERRNO(errno);
}
else if ((ptr->root->flags.no_reply) == 0)
{
}
else if ((ptr->root->flags.no_reply) == 0)
{