X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fconnect.cc;h=ff7772ca1c39bb97f14d5b6a396160fa59db1a67;hb=aeac01630eed825d8a624e7fd7c107d47bb2e40c;hp=04b86f622ee6807a54513fc98532802d260b6b60;hpb=c8a5aecba8e189092266f304ca81ab42625edf60;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/connect.cc b/src/libmemcached/connect.cc
index 04b86f62..ff7772ca 100644
--- a/src/libmemcached/connect.cc
+++ b/src/libmemcached/connect.cc
@@ -49,7 +49,7 @@ static memcached_return_t connect_poll(memcached_instance_st *server, const int
 
   size_t loop_max = 5;
 
-  if (server->root->poll_timeout == 0) {
+  if (server->root->connect_timeout == 0) {
     return memcached_set_error(
         *server, MEMCACHED_TIMEOUT, MEMCACHED_AT,
         memcached_literal_param("The time to wait for a connection to be established was set to "
@@ -59,13 +59,14 @@ static memcached_return_t connect_poll(memcached_instance_st *server, const int
   while (--loop_max) // Should only loop on cases of ERESTART or EINTR
   {
     int number_of;
-    if ((number_of = poll(fds, 1, server->root->connect_timeout)) == -1) {
+    if ((number_of = poll(fds, 1, server->root->connect_timeout)) == SOCKET_ERROR) {
       int local_errno = get_socket_errno(); // We cache in case closesocket() modifies errno
       switch (local_errno) {
 #ifdef __linux__
       case ERESTART:
 #endif
-      case EINTR: continue;
+      case EINTR:
+        continue;
 
       case EFAULT:
       case ENOMEM:
@@ -89,7 +90,7 @@ static memcached_return_t connect_poll(memcached_instance_st *server, const int
     }
 
     if (number_of == 0) {
-      if (connection_error == EINPROGRESS) {
+      if (connection_error != EALREADY) {
         int err;
         socklen_t len = sizeof(err);
         if (getsockopt(server->fd, SOL_SOCKET, SO_ERROR, (char *) &err, &len) == -1) {
@@ -100,7 +101,7 @@ static memcached_return_t connect_poll(memcached_instance_st *server, const int
         }
 
         // If Zero, my hero, we just fail to a generic MEMCACHED_TIMEOUT error
-        if (err != 0) {
+        if (err) {
           return memcached_set_errno(
               *server, err, MEMCACHED_AT,
               memcached_literal_param("getsockopt() found the error from poll() after connect() "
@@ -137,7 +138,7 @@ static memcached_return_t connect_poll(memcached_instance_st *server, const int
     }
     assert(fds[0].revents & POLLOUT);
 
-    if (fds[0].revents & POLLOUT and connection_error == EINPROGRESS) {
+    if (fds[0].revents & POLLOUT and connection_error != EALREADY) {
       int err;
       socklen_t len = sizeof(err);
       if (getsockopt(server->fd, SOL_SOCKET, SO_ERROR, (char *) &err, &len) == -1) {
@@ -169,7 +170,7 @@ static memcached_return_t set_hostinfo(memcached_instance_st *server) {
   char str_port[MEMCACHED_NI_MAXSERV] = {0};
   errno = 0;
   int length = snprintf(str_port, MEMCACHED_NI_MAXSERV, "%u", uint32_t(server->port()));
-  if (length >= MEMCACHED_NI_MAXSERV or length <= 0 or errno != 0) {
+  if (length >= MEMCACHED_NI_MAXSERV or length <= 0 or errno) {
     return memcached_set_error(*server, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT,
                                memcached_literal_param("snprintf(NI_MAXSERV)"));
   }
@@ -262,7 +263,7 @@ static bool set_socket_options(memcached_instance_st *server) {
 #ifdef HAVE_FCNTL
   // If SOCK_CLOEXEC exists then we don't need to call the following
   if (SOCK_CLOEXEC == 0) {
-    if (FD_CLOEXEC != 0) {
+    if (FD_CLOEXEC) {
       int flags;
       do {
         flags = fcntl(server->fd, F_GETFD, 0);
@@ -396,11 +397,11 @@ static memcached_return_t unix_socket_connect(memcached_instance_st *server) {
 
   do {
     int type = SOCK_STREAM;
-    if (SOCK_CLOEXEC != 0) {
+    if (SOCK_CLOEXEC) {
       type |= SOCK_CLOEXEC;
     }
 
-    if (SOCK_NONBLOCK != 0) {
+    if (SOCK_NONBLOCK) {
       type |= SOCK_NONBLOCK;
     }
 
@@ -422,9 +423,13 @@ static memcached_return_t unix_socket_connect(memcached_instance_st *server) {
       switch (errno) {
       case EINPROGRESS:
       case EALREADY:
-      case EAGAIN: server->events(POLLOUT); break;
+      case EAGAIN:
+        server->events(POLLOUT);
+        break;
 
-      case EINTR: server->reset_socket(); continue;
+      case EINTR:
+        server->reset_socket();
+        continue;
 
       case EISCONN: /* We were spinning waiting on connect */
       {
@@ -477,11 +482,11 @@ static memcached_return_t network_connect(memcached_instance_st *server) {
   /* Create the socket */
   while (server->address_info_next and server->fd == INVALID_SOCKET) {
     int type = server->address_info_next->ai_socktype;
-    if (SOCK_CLOEXEC != 0) {
+    if (SOCK_CLOEXEC) {
       type |= SOCK_CLOEXEC;
     }
 
-    if (SOCK_NONBLOCK != 0) {
+    if (SOCK_NONBLOCK) {
       type |= SOCK_NONBLOCK;
     }
 
@@ -509,11 +514,14 @@ static memcached_return_t network_connect(memcached_instance_st *server) {
     /* An error occurred */
     int local_error = get_socket_errno();
     switch (local_error) {
-    case ETIMEDOUT: timeout_error_occured = true; break;
+    case ETIMEDOUT:
+      timeout_error_occured = true;
+      break;
 
 #if EWOULDBLOCK != EAGAIN
     case EWOULDBLOCK:
 #endif
+    case EAGAIN:
     case EINPROGRESS: // nonblocking mode - first return
     case EALREADY:    // nonblocking mode - subsequent returns
     {
@@ -544,7 +552,9 @@ static memcached_return_t network_connect(memcached_instance_st *server) {
     case ECONNREFUSED:
       // Probably not running service
 
-    default: memcached_set_errno(*server, local_error, MEMCACHED_AT); break;
+    default:
+      memcached_set_errno(*server, local_error, MEMCACHED_AT);
+      break;
     }
 
     WATCHPOINT_ASSERT(server->fd != INVALID_SOCKET);
@@ -672,7 +682,8 @@ static memcached_return_t _memcached_connect(memcached_instance_st *server,
   /* We need to clean up the multi startup piece */
   switch (server->type) {
   case MEMCACHED_CONNECTION_UDP:
-  case MEMCACHED_CONNECTION_TCP: rc = network_connect(server);
+  case MEMCACHED_CONNECTION_TCP:
+    rc = network_connect(server);
 
 #if defined(LIBMEMCACHED_WITH_SASL_SUPPORT)
     if (LIBMEMCACHED_WITH_SASL_SUPPORT) {
@@ -687,7 +698,9 @@ static memcached_return_t _memcached_connect(memcached_instance_st *server,
 #endif
     break;
 
-  case MEMCACHED_CONNECTION_UNIX_SOCKET: rc = unix_socket_connect(server); break;
+  case MEMCACHED_CONNECTION_UNIX_SOCKET:
+    rc = unix_socket_connect(server);
+    break;
   }
 
   if (memcached_success(rc)) {