Abstract out ptr->hosts[server_key] references.

[m6w6/libmemcached] / libmemcached / server.h

diff --git a/libmemcached/server.h b/libmemcached/server.h
index f2d92dc1249517776ed1c34d6e1a7d187c5ab62c..10fa811cf87d626947c640805fdc007e6ed664b2 100644 (file)
--- a/libmemcached/server.h
+++ b/libmemcached/server.h
@@ -1,5 +1,5 @@
 /* LibMemcached
- * Copyright (C) 2006-2009 Brian Aker 
+ * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
  * Use and distribution licensed under the BSD license.  See
@@ -19,9 +19,9 @@ extern "C" {
 struct memcached_server_st {
   struct {
     bool is_allocated:1;
+    bool sockaddr_inited:1;
   } options;
-  bool sockaddr_inited;
-  uint16_t count;
+  uint32_t number_of_hosts;
   uint32_t cursor_active;
   in_port_t port;
   int cached_errno;
@@ -47,6 +47,20 @@ struct memcached_server_st {
   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
@@ -60,8 +74,10 @@ memcached_return_t memcached_server_cursor(memcached_st *ptr,
                                            uint32_t number_of_callbacks);
 
 LIBMEMCACHED_API
-memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key,
-                                             size_t key_length, memcached_return_t *error);
+memcached_server_st *memcached_server_by_key(memcached_st *ptr,
+                                             const char *key,
+                                             size_t key_length,
+                                             memcached_return_t *error);
 
 LIBMEMCACHED_API
 const char *memcached_server_error(memcached_server_st *ptr);
@@ -72,21 +88,23 @@ 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_API
+LIBMEMCACHED_LOCAL
 memcached_server_st *memcached_server_create(memcached_st *memc, memcached_server_st *ptr);
 
-LIBMEMCACHED_API
-memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host,
-                                                  const char *hostname, in_port_t port,
-                                                  uint32_t weight, memcached_connection_t type);
+LIBMEMCACHED_LOCAL
+memcached_server_st *memcached_server_create_with(memcached_st *memc,
+                                                  memcached_server_st *host,
+                                                  const char *hostname,
+                                                  in_port_t port,
+                                                  uint32_t weight,
+                                                  memcached_connection_t type);
 
 LIBMEMCACHED_API
 void memcached_server_free(memcached_server_st *ptr);
-LIBMEMCACHED_API
-memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr);
-LIBMEMCACHED_API
-memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat_st *memc_stat,
-                                         memcached_return_t *error);
+
+LIBMEMCACHED_LOCAL
+memcached_server_st *memcached_server_clone(memcached_server_st *clone,
+                                            memcached_server_st *ptr);
 
 LIBMEMCACHED_API
 memcached_return_t memcached_server_remove(memcached_server_st *st_ptr);