X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finitialize_query.cc;h=5950158b053feb22a6205ef825719d08277d04a3;hb=9265fa2a7ff654250faa9eef568dce3f9ec5dddf;hp=31a15fbccc4f9d0d4ab994edd3217dbeab880970;hpb=67456d74f5bd4f354a360d70da503dc58cbe5971;p=m6w6%2Flibmemcached

diff --git a/libmemcached/initialize_query.cc b/libmemcached/initialize_query.cc
index 31a15fbc..5950158b 100644
--- a/libmemcached/initialize_query.cc
+++ b/libmemcached/initialize_query.cc
@@ -38,8 +38,10 @@
 
 memcached_return_t initialize_query(memcached_st *self)
 {
-  if (not self)
+  if (self == NULL)
+  {
     return MEMCACHED_INVALID_ARGUMENTS;
+  }
 
   self->query_id++;
 
@@ -50,7 +52,7 @@ 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);
   }
 
   return MEMCACHED_SUCCESS;
@@ -59,7 +61,9 @@ memcached_return_t initialize_query(memcached_st *self)
 memcached_return_t initialize_const_query(const memcached_st *self)
 {
   if (not self)
+  {
     return MEMCACHED_INVALID_ARGUMENTS;
+  }
 
   if (memcached_server_count(self) == 0)
   {