Merge Trond.

[m6w6/libmemcached] / libmemcached / server.h

diff --git a/libmemcached/server.h b/libmemcached/server.h
index 1a92eea7d89cdd0d029e30de36283c24ee1ae1fb..76400ee3838026c75a3a9babf95bdb6ea0a5db75 100644 (file)
--- a/libmemcached/server.h
+++ b/libmemcached/server.h
@@ -9,16 +9,14 @@
  *
  */
 
-#ifndef __MEMCACHED_SERVER_H__
-#define __MEMCACHED_SERVER_H__
+#ifndef __LIBMEMCACHED_SERVER_H__
+#define __LIBMEMCACHED_SERVER_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 struct memcached_server_st {
   struct {
     bool is_allocated:1;
+    bool is_initialized:1;
     bool sockaddr_inited:1;
   } options;
   uint32_t number_of_hosts;
@@ -43,33 +41,17 @@ struct memcached_server_st {
   size_t write_buffer_offset;
   struct addrinfo *address_info;
   time_t next_retry;
-  memcached_st *root;
+  const memcached_st *root;
   uint64_t limit_maxbytes;
   char read_buffer[MEMCACHED_MAX_BUFFER];
   char write_buffer[MEMCACHED_MAX_BUFFER];
   char hostname[MEMCACHED_MAX_HOST_LENGTH];
 };
 
-// Local Only Inline
-static inline uint32_t memcached_servers_count(memcached_server_st *servers)
-{
-  return servers->number_of_hosts;
-}
 
-// Local Only Inline
-static inline uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
-{
-  return servers->number_of_hosts= count;
-}
-
-
-
-#define memcached_server_count(A) (A)->number_of_hosts
-#define memcached_server_name(A,B) (B).hostname
-#define memcached_server_port(A,B) (B).port
-#define memcached_server_list(A) (A)->servers
-#define memcached_server_list_set(A,B) (A)->servers=(B)
-#define memcached_server_response_count(A) (A)->cursor_active
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 LIBMEMCACHED_API
 memcached_return_t memcached_server_cursor(memcached_st *ptr,
@@ -92,11 +74,9 @@ void memcached_server_error_reset(memcached_server_st *ptr);
 /* These should not currently be used by end users */
 /* TODO: Is the above comment valid? If so, how can we unit test these if they
  * aren't exported. If not, we should remove the comment */
-LIBMEMCACHED_LOCAL
-memcached_server_st *memcached_server_create(memcached_st *memc, memcached_server_st *ptr);
 
 LIBMEMCACHED_LOCAL
-memcached_server_st *memcached_server_create_with(memcached_st *memc,
+memcached_server_st *memcached_server_create_with(const memcached_st *memc,
                                                   memcached_server_st *host,
                                                   const char *hostname,
                                                   in_port_t port,
@@ -107,8 +87,8 @@ LIBMEMCACHED_API
 void memcached_server_free(memcached_server_st *ptr);
 
 LIBMEMCACHED_LOCAL
-memcached_server_st *memcached_server_clone(memcached_server_st *clone,
-                                            memcached_server_st *ptr);
+memcached_server_st *memcached_server_clone(memcached_server_st *destination,
+                                            const memcached_server_st *source);
 
 LIBMEMCACHED_API
 memcached_return_t memcached_server_remove(memcached_server_st *st_ptr);
@@ -164,9 +144,28 @@ memcached_server_st *memcached_server_list_append_with_weight(memcached_server_s
 LIBMEMCACHED_API
 unsigned int memcached_server_list_count(memcached_server_st *ptr);
 
+// Local Only Inline
+static inline uint32_t memcached_servers_count(memcached_server_st *servers)
+{
+  return servers->number_of_hosts;
+}
 
-#ifdef __cplusplus
+// Local Only Inline
+static inline uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
+{
+  return servers->number_of_hosts= count;
 }
+
+
+#define memcached_server_count(A) (A)->number_of_hosts
+#define memcached_server_name(A,B) (B).hostname
+#define memcached_server_port(A,B) (B).port
+#define memcached_server_list(A) (A)->servers
+#define memcached_server_list_set(A,B) (A)->servers=(B)
+#define memcached_server_response_count(A) (A)->cursor_active
+
+#ifdef __cplusplus
+} // extern "C"
 #endif
 
-#endif /* __MEMCACHED_SERVER_H__ */
+#endif /* __LIBMEMCACHED_SERVER_H__ */