projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in Ubuntu fixes.
[m6w6/libmemcached]
/
libmemcached
/
initialize_query.cc
diff --git
a/libmemcached/initialize_query.cc
b/libmemcached/initialize_query.cc
index abc8dfdcc906f0c8994f5ab997525e2e772c0d52..00e8e6420f0bd657c95d0ebd84aa49e1fa7b1328 100644
(file)
--- a/
libmemcached/initialize_query.cc
+++ b/
libmemcached/initialize_query.cc
@@
-35,13
+35,14
@@
*/
#include <libmemcached/common.h>
*/
#include <libmemcached/common.h>
-#include <libmemcached/initialize_query.h>
memcached_return_t initialize_query(memcached_st *self)
{
memcached_return_t initialize_query(memcached_st *self)
{
- if (
!
self)
+ if (
not
self)
return MEMCACHED_INVALID_ARGUMENTS;
return MEMCACHED_INVALID_ARGUMENTS;
+ self->query_id++;
+
if (self->state.is_time_for_rebuild)
{
memcached_reset(self);
if (self->state.is_time_for_rebuild)
{
memcached_reset(self);
@@
-49,18
+50,15
@@
memcached_return_t initialize_query(memcached_st *self)
if (memcached_server_count(self) == 0)
{
if (memcached_server_count(self) == 0)
{
- return memcached_set_error(
self, MEMCACHED_NO_SERVERS, NULL
);
+ return memcached_set_error(
*self, MEMCACHED_NO_SERVERS, MEMCACHED_AT
);
}
}
-
- self->query_id++;
-
return MEMCACHED_SUCCESS;
}
memcached_return_t initialize_const_query(const memcached_st *self)
{
return MEMCACHED_SUCCESS;
}
memcached_return_t initialize_const_query(const memcached_st *self)
{
- if (
!
self)
+ if (
not
self)
return MEMCACHED_INVALID_ARGUMENTS;
if (memcached_server_count(self) == 0)
return MEMCACHED_INVALID_ARGUMENTS;
if (memcached_server_count(self) == 0)