X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.cc;h=20db52b8344ca79c74fefb07db81c739ac262f8d;hb=27bed94f9adf2d67670daf8a237be68f5bb7a076;hp=6dca4ab61f38b47570455e0230aceb45b262944c;hpb=674c7578fa870c3b57e81e765c355ce98434b310;p=awesomized%2Flibmemcached

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index 6dca4ab6..20db52b8 100644
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -194,10 +194,12 @@ uint32_t memcached_server_count(const memcached_st *self)
 const char *memcached_server_name(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);
-  if (self == NULL)
-    return NULL;
+  if (self)
+  {
+    return self->hostname;
+  }
 
-  return self->hostname;
+  return NULL;
 }
 
 in_port_t memcached_server_port(const memcached_server_instance_st self)
@@ -219,7 +221,7 @@ uint32_t memcached_server_response_count(const memcached_server_instance_st self
     return 0;
   }
 
-  return self->cursor_active;
+  return self->cursor_active_;
 }
 
 const char *memcached_server_type(const memcached_server_instance_st ptr)