Small cleanup in string.h and converted result_st macro to inline.

[awesomized/libmemcached] / libmemcached / memcached.c

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index a6b38067642fd36113329b96394bfeed862eaeea..2b96d422682edf59527f0aafca0838bab20708a8 100644 (file)
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -21,7 +21,10 @@ memcached_st *memcached_create(memcached_st *ptr)
     memset(ptr, 0, sizeof(memcached_st));
   }
 
-  ptr->options.is_initialized= true;
+#if 0
+  memcached_set_purging(ptr, false);
+  memcached_set_processing_input(ptr, false);
+#endif
 
   memcached_set_memory_allocators(ptr, NULL, NULL, NULL, NULL);
 
@@ -35,6 +38,10 @@ memcached_st *memcached_create(memcached_st *ptr)
   ptr->retry_timeout= 0;
   ptr->distribution= MEMCACHED_DISTRIBUTION_MODULA;
 
+
+  ptr->send_size= -1;
+  ptr->recv_size= -1;
+
   /* TODO, Document why we picked these defaults */
   ptr->io_msg_watermark= 500;
   ptr->io_bytes_watermark= 65 * 1024;
@@ -52,25 +59,29 @@ void server_list_free(memcached_st *ptr, memcached_server_st *servers)
     return;
 
   for (x= 0; x < memcached_servers_count(servers); x++)
+  {
     if (servers[x].address_info)
     {
       freeaddrinfo(servers[x].address_info);
       servers[x].address_info= NULL;
     }
+  }
 
   if (ptr)
   {
     ptr->call_free(ptr, servers);
   }
   else
+  {
     free(servers);
+  }
 }
 
 void memcached_servers_reset(memcached_st *ptr)
 {
-  server_list_free(ptr, ptr->hosts);
+  server_list_free(ptr, memcached_server_list(ptr));
 
-  ptr->hosts= NULL;
+  memcached_server_list_set(ptr, NULL);
   ptr->number_of_hosts= 0;
   ptr->last_disconnected_server= NULL;
   ptr->server_failure_limit= 0;
@@ -80,7 +91,7 @@ void memcached_free(memcached_st *ptr)
 {
   /* If we have anything open, lets close it now */
   memcached_quit(ptr);
-  server_list_free(ptr, ptr->hosts);
+  server_list_free(ptr, memcached_server_list(ptr));
   memcached_result_free(&ptr->result);
 
   if (ptr->on_cleanup)
@@ -93,10 +104,6 @@ void memcached_free(memcached_st *ptr)
   {
     ptr->call_free(ptr, ptr);
   }
-  else
-  {
-    ptr->options.is_initialized= false;
-  }
 }
 
 /*
@@ -150,8 +157,8 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *source)
   new_clone->io_key_prefetch= source->io_key_prefetch;
   new_clone->number_of_replicas= source->number_of_replicas;
 
-  if (source->hosts)
-    rc= memcached_server_push(new_clone, source->hosts);
+  if (memcached_server_list(source))
+    rc= memcached_server_push(new_clone, memcached_server_list(source));
 
   if (rc != MEMCACHED_SUCCESS)
   {