X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finitialize_query.cc;h=00e8e6420f0bd657c95d0ebd84aa49e1fa7b1328;hb=5dc23d0b459080d0a0081f9d94450fcfa2a1d5e3;hp=abc8dfdcc906f0c8994f5ab997525e2e772c0d52;hpb=b01326b56e6207e84749fecd9883dfa1887299ac;p=m6w6%2Flibmemcached

diff --git a/libmemcached/initialize_query.cc b/libmemcached/initialize_query.cc
index abc8dfdc..00e8e642 100644
--- a/libmemcached/initialize_query.cc
+++ b/libmemcached/initialize_query.cc
@@ -35,13 +35,14 @@
  */
 
 #include <libmemcached/common.h>
-#include <libmemcached/initialize_query.h>
 
 memcached_return_t initialize_query(memcached_st *self)
 {
-  if (! self)
+  if (not self)
     return MEMCACHED_INVALID_ARGUMENTS;
 
+  self->query_id++;
+
   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)
   {
-    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)
 {
-  if (! self)
+  if (not self)
     return MEMCACHED_INVALID_ARGUMENTS;
 
   if (memcached_server_count(self) == 0)