Merge in updates to make sure exit/return is done properly.

[m6w6/libmemcached] / libmemcached / behavior.c

diff --git a/libmemcached/behavior.c b/libmemcached/behavior.c
index b84e770a5b559cf2f35d6e6e7aa4fdca215b1b3e..f88f0a771c1f556d926a20322cfb776da7f46789 100644 (file)
--- a/libmemcached/behavior.c
+++ b/libmemcached/behavior.c
@@ -313,11 +313,20 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
         /* REFACTOR */
         /* We just try the first host, and if it is down we return zero */
         if ((memcached_connect(instance)) != MEMCACHED_SUCCESS)
-          return 0;
+        {
+          return EXIT_SUCCESS;
+        }
 
-        if (getsockopt(instance->fd, SOL_SOCKET,
-                       SO_SNDBUF, &sock_size, &sock_length))
-          return 0; /* Zero means error */
+        if (memcached_io_wait_for_write(instance) != MEMCACHED_SUCCESS)
+        {
+          return EXIT_SUCCESS;
+        }
+
+        if (getsockopt(instance->fd, SOL_SOCKET, SO_SNDBUF, &sock_size, &sock_length) < 0)
+        {
+          ptr->cached_errno= errno;
+          return EXIT_SUCCESS; /* Zero means error */
+        }
       }
 
       return (uint64_t) sock_size;
@@ -340,11 +349,20 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
       {
         /* We just try the first host, and if it is down we return zero */
         if ((memcached_connect(instance)) != MEMCACHED_SUCCESS)
-          return 0;
+        {
+          return EXIT_SUCCESS;
+        }
 
-        if (getsockopt(instance->fd, SOL_SOCKET,
-                       SO_RCVBUF, &sock_size, &sock_length))
-          return 0; /* Zero means error */
+        if (memcached_io_wait_for_write(instance) != MEMCACHED_SUCCESS)
+        {
+          return EXIT_SUCCESS;
+        }
+
+        if (getsockopt(instance->fd, SOL_SOCKET, SO_RCVBUF, &sock_size, &sock_length) < 0)
+        {
+          ptr->cached_errno= errno;
+          return EXIT_SUCCESS; /* Zero means error */
+        }
 
       }
 
@@ -367,7 +385,7 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_MAX:
   default:
     WATCHPOINT_ASSERT(0); /* Programming mistake if it gets this far */
-    return 0;
+    return EXIT_SUCCESS;
   }
 
   /* NOTREACHED */