A number of fixes/etc.

[m6w6/libmemcached] / libmemcached / memcached.c

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index 6df260c6acdc9cd6a6c6bc15156f3fd38974e43f..4e0308a043df72b29bdc43800a475d04942c73d7 100644 (file)
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -1,6 +1,14 @@
-/*
-  Memcached library
-*/
+/* LibMemcached
+ * Copyright (C) 2006-2010 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary: 
+ *
+ */
+
 #include "common.h"
 
 static const memcached_st global_copy= {
@@ -124,35 +132,9 @@ memcached_st *memcached_create(memcached_st *ptr)
   return ptr;
 }
 
-void server_list_free(memcached_st *ptr, memcached_server_st *servers)
-{
-  uint32_t x;
-
-  if (servers == NULL)
-    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)
-  {
-    libmemcached_free(ptr, servers);
-  }
-  else
-  {
-    free(servers);
-  }
-}
-
 void memcached_servers_reset(memcached_st *ptr)
 {
-  server_list_free(ptr, memcached_server_list(ptr));
+  memcached_server_list_free(memcached_server_list(ptr));
 
   memcached_server_list_set(ptr, NULL);
   ptr->number_of_hosts= 0;
@@ -164,7 +146,7 @@ void memcached_free(memcached_st *ptr)
 {
   /* If we have anything open, lets close it now */
   memcached_quit(ptr);
-  server_list_free(ptr, memcached_server_list(ptr));
+  memcached_server_list_free(memcached_server_list(ptr));
   memcached_result_free(&ptr->result);
 
   if (ptr->on_cleanup)
@@ -244,8 +226,8 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
   new_clone->io_key_prefetch= source->io_key_prefetch;
   new_clone->number_of_replicas= source->number_of_replicas;
 
-  if (memcached_server_list(source))
-    rc= memcached_server_push(new_clone, memcached_server_list(source));
+  if (memcached_server_count(source))
+    rc= memcached_push(new_clone, source);
 
   if (rc != MEMCACHED_SUCCESS)
   {
@@ -288,3 +270,18 @@ void *memcached_set_user_data(memcached_st *ptr, void *data)
 
   return ret;
 }
+
+memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source)
+{
+  return memcached_server_push(destination, source->servers);
+}
+
+inline memcached_server_write_instance_st memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
+{
+  return &ptr->servers[server_key];
+}
+
+inline memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key)
+{
+  return &ptr->servers[server_key];
+}