X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_server.c;h=5a94e767b38c6bb618c4b3789975403ff6db2723;hb=b4de8d3fd063b9017797dd9809ab3acb8a537606;hp=2ecbe214d9fb416f60b9fca98290bb70ee37977f;hpb=24353992d6086a53123cc6a42fd41b982acb0952;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached_server.c b/libmemcached/memcached_server.c
index 2ecbe214..5a94e767 100644
--- a/libmemcached/memcached_server.c
+++ b/libmemcached/memcached_server.c
@@ -12,10 +12,12 @@ memcached_server_st *memcached_server_create(memcached_st *memc, memcached_serve
     if (!ptr)
       return NULL; /*  MEMCACHED_MEMORY_ALLOCATION_FAILURE */
 
-    ptr->is_allocated= true;
+    ptr->options.is_allocated= true;
   }
   else
+  {
     memset(ptr, 0, sizeof(memcached_server_st));
+  }
 
   ptr->root= memc;
 
@@ -23,8 +25,8 @@ memcached_server_st *memcached_server_create(memcached_st *memc, memcached_serve
 }
 
 memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host,
-                                                  const char *hostname, unsigned int port,
-                                                  uint32_t weight, memcached_connection type)
+                                                  const char *hostname, in_port_t port,
+                                                  uint32_t weight, memcached_connection_t type)
 {
   host= memcached_server_create(memc, host);
 
@@ -59,10 +61,15 @@ void memcached_server_free(memcached_server_st *ptr)
   if (ptr->address_info)
     freeaddrinfo(ptr->address_info);
 
-  if (ptr->is_allocated)
+
+  if (memcached_is_allocated(ptr))
+  {
     ptr->root->call_free(ptr->root, ptr);
+  }
   else
+  {
     memset(ptr, 0, sizeof(memcached_server_st));
+  }
 }
 
 /*
@@ -90,10 +97,10 @@ memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcache
 
 }
 
-memcached_return memcached_server_cursor(memcached_st *ptr,
-                                         memcached_server_function *callback,
-                                         void *context,
-                                         unsigned int number_of_callbacks)
+memcached_return_t memcached_server_cursor(memcached_st *ptr,
+                                           memcached_server_fn *callback,
+                                           void *context,
+                                           uint32_t number_of_callbacks)
 {
   unsigned int y;
 
@@ -115,12 +122,12 @@ memcached_return memcached_server_cursor(memcached_st *ptr,
   return MEMCACHED_SUCCESS;
 }
 
-memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key, size_t key_length, memcached_return *error)
+memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key, size_t key_length, memcached_return_t *error)
 {
   uint32_t server_key;
 
   *error= memcached_validate_key_length(key_length,
-                                        ptr->flags & MEM_BINARY_PROTOCOL);
+                                        ptr->flags.binary_protocol);
   unlikely (*error != MEMCACHED_SUCCESS)
     return NULL;
 
@@ -130,7 +137,7 @@ memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key
     return NULL;
   }
 
-  if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+  if (ptr->flags.verify_key && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
   {
     *error= MEMCACHED_BAD_KEY_PROVIDED;
     return NULL;