projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
c++: references cannot be NULL
[awesomized/libmemcached]
/
libmemcached
/
flush.cc
diff --git
a/libmemcached/flush.cc
b/libmemcached/flush.cc
index 1e1533ddaf35a2af31bec0a85a181670ba50d327..cbb66bfeb1a29501d55e7c86238ead7e39818eb3 100644
(file)
--- a/
libmemcached/flush.cc
+++ b/
libmemcached/flush.cc
@@
-36,7
+36,7
@@
#include <libmemcached/common.h>
#include <libmemcached/common.h>
-static memcached_return_t memcached_flush_binary(
memcached_st
*ptr,
+static memcached_return_t memcached_flush_binary(
Memcached
*ptr,
time_t expiration,
const bool reply)
{
time_t expiration,
const bool reply)
{
@@
-52,7
+52,7
@@
static memcached_return_t memcached_flush_binary(memcached_st *ptr,
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
-
org::libmemcached::Instance
* instance= memcached_instance_fetch(ptr, x);
+
memcached_instance_st
* instance= memcached_instance_fetch(ptr, x);
initialize_binary_request(instance, request.message.header);
if (reply)
initialize_binary_request(instance, request.message.header);
if (reply)
@@
-84,9
+84,9
@@
static memcached_return_t memcached_flush_binary(memcached_st *ptr,
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
-
org::libmemcached::Instance
* instance= memcached_instance_fetch(ptr, x);
+
memcached_instance_st
* instance= memcached_instance_fetch(ptr, x);
- if (
memcached_instance_response_count(instance
) > 0)
+ if (
instance->response_count(
) > 0)
{
(void)memcached_response(instance, NULL, 0, NULL);
}
{
(void)memcached_response(instance, NULL, 0, NULL);
}
@@
-95,7
+95,7
@@
static memcached_return_t memcached_flush_binary(memcached_st *ptr,
return rc;
}
return rc;
}
-static memcached_return_t memcached_flush_textual(
memcached_st
*ptr,
+static memcached_return_t memcached_flush_textual(
Memcached
*ptr,
time_t expiration,
const bool reply)
{
time_t expiration,
const bool reply)
{
@@
-115,7
+115,7
@@
static memcached_return_t memcached_flush_textual(memcached_st *ptr,
memcached_return_t rc= MEMCACHED_SUCCESS;
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
memcached_return_t rc= MEMCACHED_SUCCESS;
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
-
org::libmemcached::Instance
* instance= memcached_instance_fetch(ptr, x);
+
memcached_instance_st
* instance= memcached_instance_fetch(ptr, x);
libmemcached_io_vector_st vector[]=
{
libmemcached_io_vector_st vector[]=
{
@@
-147,8
+147,9
@@
static memcached_return_t memcached_flush_textual(memcached_st *ptr,
return rc;
}
return rc;
}
-memcached_return_t memcached_flush(memcached_st *
ptr
, time_t expiration)
+memcached_return_t memcached_flush(memcached_st *
shell
, time_t expiration)
{
{
+ Memcached* ptr= memcached2Memcached(shell);
memcached_return_t rc;
if (memcached_failed(rc= initialize_query(ptr, true)))
{
memcached_return_t rc;
if (memcached_failed(rc= initialize_query(ptr, true)))
{