X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fconnect.c;h=36971f60aa9c86e4a19d4bf8e42bc85a47ea1aa3;hb=6cd2ec807b660cbdc893bfbf67d6ad306fb4b942;hp=96f26fb80e07f6116435eb4ef9259f4d9db14134;hpb=7f9bc55d79a4e7133fdeaaa1150451717c103b28;p=awesomized%2Flibmemcached

diff --git a/libmemcached/connect.c b/libmemcached/connect.c
index 96f26fb8..36971f60 100644
--- a/libmemcached/connect.c
+++ b/libmemcached/connect.c
@@ -208,7 +208,9 @@ static memcached_return_t network_connect(memcached_server_st *ptr)
   {
     struct addrinfo *use;
 
-    if (!ptr->sockaddr_inited ||
+    WATCHPOINT_ASSERT(ptr->cursor_active == 0);
+
+    if (! ptr->options.sockaddr_inited ||
         (!(ptr->root->flags.use_cache_lookups)))
     {
       memcached_return_t rc;
@@ -216,7 +218,7 @@ static memcached_return_t network_connect(memcached_server_st *ptr)
       rc= set_hostinfo(ptr);
       if (rc != MEMCACHED_SUCCESS)
         return rc;
-      ptr->sockaddr_inited= true;
+      ptr->options.sockaddr_inited= true;
     }
 
     use= ptr->address_info;
@@ -282,7 +284,6 @@ static memcached_return_t network_connect(memcached_server_st *ptr)
 
       if (ptr->fd != -1)
       {
-        WATCHPOINT_ASSERT(ptr->cursor_active == 0);
         ptr->server_failure_counter= 0;
         return MEMCACHED_SUCCESS;
       }