Small cleanups in the error messages.

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index 1d95fd45b5bd65d75640485fded0862e02e93b1e..0b77c7a87afdc36a0938a7f5ad776a6119d82e95 100644 (file)
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -37,9 +37,9 @@
 
 
 #include <libmemcached/common.h>
-#include <assert.h>
+#include <cassert>
+#include <ctime>
 #include <sys/time.h>
-#include <time.h>
 
 static memcached_return_t connect_poll(memcached_server_st *ptr)
 {
@@ -358,8 +358,7 @@ static memcached_return_t unix_socket_connect(memcached_server_st *ptr)
 
   if ((ptr->fd= socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
   {
-    ptr->cached_errno= errno;
-    return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
+    return memcached_set_errno(*ptr, errno, NULL);
   }
 
   struct sockaddr_un servAddr;
@@ -388,7 +387,7 @@ test_connect:
     }
   }
 
-  WATCHPOINT_ASSERT(ptr->fd != -1);
+  WATCHPOINT_ASSERT(ptr->fd != INVALID_SOCKET);
 
   return MEMCACHED_SUCCESS;
 #else
@@ -441,9 +440,7 @@ static memcached_return_t network_connect(memcached_server_st *ptr)
                          ptr->address_info_next->ai_socktype,
                          ptr->address_info_next->ai_protocol)) < 0)
     {
-      ptr->cached_errno= get_socket_errno();
-      WATCHPOINT_ERRNO(get_socket_errno());
-      return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
+      return memcached_set_errno(*ptr, get_socket_errno(), NULL);
     }
 
     (void)set_socket_options(ptr);
@@ -582,7 +579,7 @@ memcached_return_t memcached_connect(memcached_server_write_instance_st ptr)
     if (ptr->fd != INVALID_SOCKET && ptr->root->sasl.callbacks)
     {
       rc= memcached_sasl_authenticate_connection(ptr);
-      if (rc != MEMCACHED_SUCCESS)
+      if (memcached_failed(rc))
       {
         (void)closesocket(ptr->fd);
         ptr->fd= INVALID_SOCKET;

diff --git a/libmemcached/strerror.cc b/libmemcached/strerror.cc
index 39583152e03205ec8cb2ba2bbecfaaa1a7522d79..682072c14a30f4e9db3782c98a5463279d30d775 100644 (file)
--- a/libmemcached/strerror.cc
+++ b/libmemcached/strerror.cc
@@ -27,7 +27,7 @@ const char *memcached_strerror(memcached_st *ptr, memcached_return_t rc)
     return "SERVER ERROR";
   case MEMCACHED_WRITE_FAILURE:
     return "WRITE FAILURE";
-  case MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE:
+  case MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE: // DEPRECATED
     return "CONNECTION SOCKET CREATE FAILURE";
   case MEMCACHED_DATA_EXISTS:
     return "CONNECTION DATA EXISTS";