projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
memcp: fix #83
[awesomized/libmemcached]
/
libmemcached
/
initialize_query.cc
diff --git
a/libmemcached/initialize_query.cc
b/libmemcached/initialize_query.cc
index abc8dfdcc906f0c8994f5ab997525e2e772c0d52..cef8e575f10f62e101d3d16c466ed0cd2980f2a6 100644
(file)
--- a/
libmemcached/initialize_query.cc
+++ b/
libmemcached/initialize_query.cc
@@
-35,12
+35,18
@@
*/
#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 *self, bool increment_query_id
)
{
{
- if (! self)
+ if (self == NULL)
+ {
return MEMCACHED_INVALID_ARGUMENTS;
return MEMCACHED_INVALID_ARGUMENTS;
+ }
+
+ if (increment_query_id)
+ {
+ self->query_id++;
+ }
if (self->state.is_time_for_rebuild)
{
if (self->state.is_time_for_rebuild)
{
@@
-49,19
+55,21
@@
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++
;
+ memcached_error_free(*self);
+
memcached_result_reset(&self->result)
;
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
-memcached_return_t initialize_const_query(const
memcached_st
*self)
+memcached_return_t initialize_const_query(const
Memcached
*self)
{
{
- if (! self)
+ if (self == NULL)
+ {
return MEMCACHED_INVALID_ARGUMENTS;
return MEMCACHED_INVALID_ARGUMENTS;
+ }
if (memcached_server_count(self) == 0)
{
if (memcached_server_count(self) == 0)
{