Moved init for socket to options.

diff --git a/libmemcached/connect.c b/libmemcached/connect.c
index e58e37fc1bcc7746dadcff00828d5d50ea92d3db..36971f60aa9c86e4a19d4bf8e42bc85a47ea1aa3 100644 (file)
--- a/libmemcached/connect.c
+++ b/libmemcached/connect.c
@@ -210,7 +210,7 @@ static memcached_return_t network_connect(memcached_server_st *ptr)
 
     WATCHPOINT_ASSERT(ptr->cursor_active == 0);
 
-    if (!ptr->sockaddr_inited ||
+    if (! ptr->options.sockaddr_inited ||
         (!(ptr->root->flags.use_cache_lookups)))
     {
       memcached_return_t rc;
@@ -218,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;

diff --git a/libmemcached/hosts.c b/libmemcached/hosts.c
index e0224222176626e0d63dee54c765ca1df236cb83..5ce4b70dde58e024fbf34f5ef5024fef5c1da70a 100644 (file)
--- a/libmemcached/hosts.c
+++ b/libmemcached/hosts.c
@@ -323,7 +323,7 @@ memcached_return_t memcached_server_push(memcached_st *ptr, memcached_server_st
   new_host_list= ptr->call_realloc(ptr, ptr->hosts,
                                    sizeof(memcached_server_st) * (count + ptr->number_of_hosts));
 
-  if (!new_host_list)
+  if (! new_host_list)
     return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
 
   ptr->hosts= new_host_list;

diff --git a/libmemcached/server.c b/libmemcached/server.c
index 814962c76675f8d47ed8b34d301c2262a5411b66..42abda2dec11563e8254097c6d2e470cc2ab9ea0 100644 (file)
--- a/libmemcached/server.c
+++ b/libmemcached/server.c
@@ -1,5 +1,5 @@
 /* LibMemcached
- * Copyright (C) 2006-2009 Brian Aker 
+ * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
  * Use and distribution licensed under the BSD license.  See
@@ -94,9 +94,9 @@ memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcache
   if (ptr == NULL)
     return NULL;
 
-  rv = memcached_server_create_with(ptr->root, clone,
-                                    ptr->hostname, ptr->port, ptr->weight,
-                                    ptr->type);
+  rv= memcached_server_create_with(ptr->root, clone,
+                                   ptr->hostname, ptr->port, ptr->weight,
+                                   ptr->type);
   if (rv != NULL)
   {
     rv->cached_errno= ptr->cached_errno;

diff --git a/libmemcached/server.h b/libmemcached/server.h
index 66a23a56f28371adae5407d4b5f934ef866447be..d8e9daa849674666ee01e496da9088e4ec9dd412 100644 (file)
--- a/libmemcached/server.h
+++ b/libmemcached/server.h
@@ -1,5 +1,5 @@
 /* LibMemcached
- * Copyright (C) 2006-2009 Brian Aker 
+ * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
  * Use and distribution licensed under the BSD license.  See
@@ -19,8 +19,8 @@ extern "C" {
 struct memcached_server_st {
   struct {
     bool is_allocated:1;
+    bool sockaddr_inited:1;
   } options;
-  bool sockaddr_inited;
   uint16_t count;
   uint32_t cursor_active;
   in_port_t port;