projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in 1.0.3
[awesomized/libmemcached]
/
libmemcached
/
stats.cc
diff --git
a/libmemcached/stats.cc
b/libmemcached/stats.cc
index c01b2acc421d9e0cf3be6c800f81b0109913deb2..d5d1c234b589f18d205b158d42eee31e1ccaad7c 100644
(file)
--- a/
libmemcached/stats.cc
+++ b/
libmemcached/stats.cc
@@
-360,7
+360,7
@@
static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
request.message.header.request.keylen= htons(uint16_t(args_length));
request.message.header.request.bodylen= htonl(uint32_t( args_length));
request.message.header.request.keylen= htons(uint16_t(args_length));
request.message.header.request.bodylen= htonl(uint32_t( args_length));
-
struct
libmemcached_io_vector_st vector[]=
+ libmemcached_io_vector_st vector[]=
{
{ request.bytes, sizeof(request.bytes) },
{ args, args_length }
{
{ request.bytes, sizeof(request.bytes) },
{ args, args_length }
@@
-374,7
+374,7
@@
static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
}
else
{
}
else
{
-
struct
libmemcached_io_vector_st vector[]=
+ libmemcached_io_vector_st vector[]=
{
{ request.bytes, sizeof(request.bytes) }
};
{
{ request.bytes, sizeof(request.bytes) }
};
@@
-437,7
+437,7
@@
static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat,
memcached_server_write_instance_st instance,
struct local_context *check)
{
memcached_server_write_instance_st instance,
struct local_context *check)
{
-
struct
libmemcached_io_vector_st vector[]=
+ libmemcached_io_vector_st vector[]=
{
{ memcached_literal_param("stats ") },
{ args, args_length },
{
{ memcached_literal_param("stats ") },
{ args, args_length },
@@
-543,7
+543,7
@@
memcached_stat_st *memcached_stat(memcached_st *self, char *args, memcached_retu
memcached_server_write_instance_st instance= memcached_server_instance_fetch(self, x);
memcached_return_t temp_return;
memcached_server_write_instance_st instance= memcached_server_instance_fetch(self, x);
memcached_return_t temp_return;
- if (
self->flags.binary_protocol
)
+ if (
memcached_is_binary(self)
)
{
temp_return= binary_stats_fetch(stat_instance, args, args_length, instance, NULL);
}
{
temp_return= binary_stats_fetch(stat_instance, args, args_length, instance, NULL);
}