projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update for compiling on OSX.
[m6w6/libmemcached]
/
libmemcached
/
initialize_query.cc
diff --git
a/libmemcached/initialize_query.cc
b/libmemcached/initialize_query.cc
index 00e8e6420f0bd657c95d0ebd84aa49e1fa7b1328..dca3c4d8276cc0c33c188f663571c5ad0a106812 100644
(file)
--- a/
libmemcached/initialize_query.cc
+++ b/
libmemcached/initialize_query.cc
@@
-36,12
+36,17
@@
#include <libmemcached/common.h>
#include <libmemcached/common.h>
-memcached_return_t initialize_query(memcached_st *self)
+memcached_return_t initialize_query(memcached_st *self
, bool increment_query_id
)
{
{
- if (not self)
+ if (self == NULL)
+ {
return MEMCACHED_INVALID_ARGUMENTS;
return MEMCACHED_INVALID_ARGUMENTS;
+ }
- self->query_id++;
+ if (increment_query_id)
+ {
+ self->query_id++;
+ }
if (self->state.is_time_for_rebuild)
{
if (self->state.is_time_for_rebuild)
{
@@
-53,13
+58,17
@@
memcached_return_t initialize_query(memcached_st *self)
return memcached_set_error(*self, MEMCACHED_NO_SERVERS, MEMCACHED_AT);
}
return memcached_set_error(*self, MEMCACHED_NO_SERVERS, MEMCACHED_AT);
}
+ memcached_error_free(*self);
+
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 (not self)
+ if (self == NULL)
+ {
return MEMCACHED_INVALID_ARGUMENTS;
return MEMCACHED_INVALID_ARGUMENTS;
+ }
if (memcached_server_count(self) == 0)
{
if (memcached_server_count(self) == 0)
{