projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Remove sample.cnf
[awesomized/libmemcached]
/
libmemcached
/
dump.c
diff --git
a/libmemcached/dump.c
b/libmemcached/dump.c
index 0e556e61d6d1951c2aa880695c286d1dd147a27f..9ec2dab5982ebbf46bce70dcbc8fa797dc198b48 100644
(file)
--- a/
libmemcached/dump.c
+++ b/
libmemcached/dump.c
@@
-11,7
+11,6
@@
static memcached_return_t ascii_dump(memcached_st *ptr, memcached_dump_fn *callb
{
memcached_return_t rc= MEMCACHED_SUCCESS;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
{
memcached_return_t rc= MEMCACHED_SUCCESS;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
- size_t send_length;
uint32_t server_key;
uint32_t x;
uint32_t server_key;
uint32_t x;
@@
-20,16
+19,22
@@
static memcached_return_t ascii_dump(memcached_st *ptr, memcached_dump_fn *callb
for (server_key= 0; server_key < memcached_server_count(ptr); server_key++)
{
for (server_key= 0; server_key < memcached_server_count(ptr); server_key++)
{
- memcached_server_
instance_st *
instance;
+ memcached_server_
write_instance_st
instance;
instance= memcached_server_instance_fetch(ptr, server_key);
/* 256 I BELIEVE is the upper limit of slabs */
for (x= 0; x < 256; x++)
{
instance= memcached_server_instance_fetch(ptr, server_key);
/* 256 I BELIEVE is the upper limit of slabs */
for (x= 0; x < 256; x++)
{
- send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
- "stats cachedump %u 0 0\r\n", x);
+ int send_length;
+ send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
+ "stats cachedump %u 0 0\r\n", x);
- rc= memcached_do(instance, buffer, send_length, 1);
+ if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || send_length < 0)
+ {
+ return MEMCACHED_FAILURE;
+ }
+
+ rc= memcached_do(instance, buffer, (size_t)send_length, true);
unlikely (rc != MEMCACHED_SUCCESS)
goto error;
unlikely (rc != MEMCACHED_SUCCESS)
goto error;