Remove how use instance (keep API intact)

[m6w6/libmemcached] / libmemcachedutil / ping.cc

diff --git a/libmemcachedutil/ping.cc b/libmemcachedutil/ping.cc
index 82d891a9e090bbb6705cbda7192090731fd38159..b2192a1dbf79ff5d1aab0c8b03fd25ef4fd54fa9 100644 (file)
--- a/libmemcachedutil/ping.cc
+++ b/libmemcachedutil/ping.cc
@@ -42,11 +42,13 @@
 bool libmemcached_util_ping(const char *hostname, in_port_t port, memcached_return_t *ret)
 {
   memcached_return_t unused;
-  if (not ret)
+  if (ret == NULL)
+  {
     ret= &unused;
+  }
 
   memcached_st *memc_ptr= memcached_create(NULL);
-  if (not memc_ptr)
+  if (memc_ptr == NULL)
   {
     *ret= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
     return false;
@@ -63,8 +65,8 @@ bool libmemcached_util_ping(const char *hostname, in_port_t port, memcached_retu
     memcached_server_instance_st instance=
       memcached_server_instance_by_position(memc_ptr, 0);
 
-    assert_msg(instance and instance->error_messages, " ");
-    if (instance and instance->error_messages)
+    assert_msg(instance and memcached_server_error(instance), " ");
+    if (instance and memcached_server_error(instance))
     {
       rc= memcached_server_error_return(instance);
     }
@@ -117,8 +119,8 @@ bool libmemcached_util_ping2(const char *hostname, in_port_t port, const char *u
     memcached_server_instance_st instance=
       memcached_server_instance_by_position(memc_ptr, 0);
 
-    assert_msg(instance and instance->error_messages, " ");
-    if (instance and instance->error_messages)
+    assert_msg(instance and memcached_server_error(instance), " ");
+    if (instance and memcached_server_error(instance))
     {
       rc= memcached_server_error_return(instance);
     }