projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
tests: honor EPIPE in kill(HUP) test
[awesomized/libmemcached]
/
libmemcached
/
stats.cc
diff --git
a/libmemcached/stats.cc
b/libmemcached/stats.cc
index 180b0d982204c3e34b089d78c7428eba3dc8b292..9e6083e9d841a9f0d6f7425d9ddff3e827e1f33e 100644
(file)
--- a/
libmemcached/stats.cc
+++ b/
libmemcached/stats.cc
@@
-484,6
+484,7
@@
static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
protocol_binary_request_stats request= {}; // = {.bytes= {0}};
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
protocol_binary_request_stats request= {}; // = {.bytes= {0}};
+ memcached_return_t rc;
initialize_binary_request(instance, request.message.header);
initialize_binary_request(instance, request.message.header);
@@
-501,10
+502,9
@@
static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
{ args, args_length }
};
{ args, args_length }
};
- if (memcached_
vdo(instance, vector, 2, true) != MEMCACHED_SUCCESS
)
+ if (memcached_
failed(rc = memcached_vdo(instance, vector, 2, true))
)
{
{
- memcached_io_reset(instance);
- return MEMCACHED_WRITE_FAILURE;
+ return rc;
}
}
else
}
}
else
@@
-514,17
+514,16
@@
static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
{ request.bytes, sizeof(request.bytes) }
};
{ request.bytes, sizeof(request.bytes) }
};
- if (memcached_
vdo(instance, vector, 1, true) != MEMCACHED_SUCCESS
)
+ if (memcached_
failed(rc = memcached_vdo(instance, vector, 1, true))
)
{
{
- memcached_io_reset(instance);
- return MEMCACHED_WRITE_FAILURE;
+ return rc;
}
}
memcached_server_response_decrement(instance);
while (1)
{
}
}
memcached_server_response_decrement(instance);
while (1)
{
-
memcached_return_t
rc= memcached_response(instance, buffer, sizeof(buffer), NULL);
+ rc= memcached_response(instance, buffer, sizeof(buffer), NULL);
if (rc == MEMCACHED_END)
{
if (rc == MEMCACHED_END)
{
@@
-533,7
+532,6
@@
static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
if (rc != MEMCACHED_SUCCESS)
{
if (rc != MEMCACHED_SUCCESS)
{
- memcached_io_reset(instance);
return rc;
}
return rc;
}