projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-170
[awesomized/libmemcached]
/
libmemcached
/
verbosity.cc
diff --git
a/libmemcached/verbosity.cc
b/libmemcached/verbosity.cc
index e2aac3c74ba88c24bee5560781c2d8cb66bfa616..4a9918d25f82aeb0f675be0d1f6ff8ef52451ea4 100644
(file)
--- a/
libmemcached/verbosity.cc
+++ b/
libmemcached/verbosity.cc
@@
-44,10
+44,10
@@
struct context_st
};
static memcached_return_t _set_verbosity(const memcached_st *,
};
static memcached_return_t _set_verbosity(const memcached_st *,
- const memcached_server_
st *
server,
+ const memcached_server_
instance_st
server,
void *context)
{
void *context)
{
-
const libmemcached_io_vector_st *execute= (const
libmemcached_io_vector_st *)context;
+
libmemcached_io_vector_st *vector= (
libmemcached_io_vector_st *)context;
memcached_st local_memc;
memcached_st *memc_ptr= memcached_create(&local_memc);
memcached_st local_memc;
memcached_st *memc_ptr= memcached_create(&local_memc);
@@
-56,10
+56,10
@@
static memcached_return_t _set_verbosity(const memcached_st *,
if (rc == MEMCACHED_SUCCESS)
{
if (rc == MEMCACHED_SUCCESS)
{
-
memcached_server_write_instance_st instance= memcached_server
_instance_fetch(memc_ptr, 0);
+
org::libmemcached::Instance* instance= memcached
_instance_fetch(memc_ptr, 0);
- rc= memcached_vdo(instance,
execute, 3
, true);
+ rc= memcached_vdo(instance,
vector, 4
, true);
if (rc == MEMCACHED_SUCCESS)
{
if (rc == MEMCACHED_SUCCESS)
{
@@
-75,6
+75,12
@@
static memcached_return_t _set_verbosity(const memcached_st *,
memcached_return_t memcached_verbosity(memcached_st *ptr, uint32_t verbosity)
{
memcached_return_t memcached_verbosity(memcached_st *ptr, uint32_t verbosity)
{
+ memcached_return_t rc;
+ if (memcached_failed(rc= initialize_query(ptr, false)))
+ {
+ return rc;
+ }
+
memcached_server_fn callbacks[1];
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
memcached_server_fn callbacks[1];
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
@@
-86,10
+92,11
@@
memcached_return_t memcached_verbosity(memcached_st *ptr, uint32_t verbosity)
memcached_literal_param("snprintf(MEMCACHED_DEFAULT_COMMAND_SIZE)"));
}
memcached_literal_param("snprintf(MEMCACHED_DEFAULT_COMMAND_SIZE)"));
}
-
struct
libmemcached_io_vector_st vector[]=
+ libmemcached_io_vector_st vector[]=
{
{
+ { NULL, 0 },
{ memcached_literal_param("verbosity ") },
{ memcached_literal_param("verbosity ") },
- { buffer, s
end_length
},
+ { buffer, s
ize_t(send_length)
},
{ memcached_literal_param("\r\n") }
};
{ memcached_literal_param("\r\n") }
};