X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.h;h=9e468038f64912a5ed202687d977749dda4383c4;hb=ea47169abd0793bb7eb1b72e4de411ae9b43dce4;hp=10cf50fdf47f97dc1fd0f064527399321aee8e2c;hpb=addf09c6f6cf93f980f3de9cf649258c965b2934;p=m6w6%2Flibmemcached

diff --git a/libmemcached/server.h b/libmemcached/server.h
index 10cf50fd..9e468038 100644
--- a/libmemcached/server.h
+++ b/libmemcached/server.h
@@ -9,17 +9,16 @@
  *
  */
 
-#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 sockaddr_inited:1;
+    bool is_allocated MEMCACHED_BITFIELD;
+    bool is_initialized MEMCACHED_BITFIELD;
+    bool sockaddr_inited MEMCACHED_BITFIELD;
+    bool is_shutting_down MEMCACHED_BITFIELD;
   } options;
   uint32_t number_of_hosts;
   uint32_t cursor_active;
@@ -47,29 +46,13 @@ struct memcached_server_st {
   uint64_t limit_maxbytes;
   char read_buffer[MEMCACHED_MAX_BUFFER];
   char write_buffer[MEMCACHED_MAX_BUFFER];
-  char hostname[MEMCACHED_MAX_HOST_LENGTH];
+  char hostname[NI_MAXHOST];
 };
 
-// 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,
@@ -105,8 +88,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);
@@ -162,9 +145,22 @@ memcached_server_st *memcached_server_list_append_with_weight(memcached_server_s
 LIBMEMCACHED_API
 unsigned int memcached_server_list_count(memcached_server_st *ptr);
 
+LIBMEMCACHED_API
+uint32_t memcached_servers_count(memcached_server_st *servers);
+
+LIBMEMCACHED_LOCAL
+uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t 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__ */