Update from Padraig, one additional valgrind warning I found cleaned up

[m6w6/libmemcached] / libmemcached / memcached_server.h

diff --git a/libmemcached/memcached_server.h b/libmemcached/memcached_server.h
index a91454f25dc66b53ff58fd5b455d300ef163e595..de57eaec3534cf69cba4fd5cd91707cf666d4740 100644 (file)
--- a/libmemcached/memcached_server.h
+++ b/libmemcached/memcached_server.h
@@ -6,12 +6,8 @@
  * Author: Brian Aker
  */
 
-#ifndef LIBMEMCACHED_MEMCACHED_SERVER_H
-#define LIBMEMCACHED_MEMCACHED_SERVER_H
-
-#ifndef LIBMEMCACHED_MEMCACHED_H
-#error "Please include <libmemcached/memcached.h> instead"
-#endif
+#ifndef __MEMCACHED_SERVER_H__
+#define __MEMCACHED_SERVER_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,13 +49,13 @@ struct memcached_server_st {
 #define memcached_server_response_count(A) (A)->cursor_active
 
 LIBMEMCACHED_API
-memcached_return memcached_server_cursor(memcached_st *ptr, 
+memcached_return memcached_server_cursor(memcached_st *ptr,
                                          memcached_server_function *callback,
                                          void *context,
                                          unsigned int number_of_callbacks);
 
 LIBMEMCACHED_API
-memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key, 
+memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key,
                                              size_t key_length, memcached_return *error);
 
 LIBMEMCACHED_API
@@ -75,8 +71,8 @@ LIBMEMCACHED_API
 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, unsigned int port, 
+memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host,
+                                                  const char *hostname, unsigned int port,
                                                   uint32_t weight, memcached_connection type);
 
 LIBMEMCACHED_API
@@ -90,56 +86,11 @@ memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat_st *
 LIBMEMCACHED_API
 memcached_return memcached_server_remove(memcached_server_st *st_ptr);
 
-/* Server Public functions */
-
-LIBMEMCACHED_API
-memcached_return memcached_server_add_udp(memcached_st *ptr, 
-                                          const char *hostname,
-                                          unsigned int port);
-LIBMEMCACHED_API
-memcached_return memcached_server_add_unix_socket(memcached_st *ptr, 
-                                                  const char *filename);
-LIBMEMCACHED_API
-memcached_return memcached_server_add(memcached_st *ptr, const char *hostname, 
-                                      unsigned int port);
-
-LIBMEMCACHED_API
-memcached_return memcached_server_add_udp_with_weight(memcached_st *ptr, 
-                                                      const char *hostname,
-                                                      unsigned int port,
-                                                      uint32_t weight);
-LIBMEMCACHED_API
-memcached_return memcached_server_add_unix_socket_with_weight(memcached_st *ptr, 
-                                                              const char *filename,
-                                                              uint32_t weight);
 LIBMEMCACHED_API
-memcached_return memcached_server_add_with_weight(memcached_st *ptr, const char *hostname, 
-                                                  unsigned int port,
-                                                  uint32_t weight);
-LIBMEMCACHED_API
-void memcached_server_list_free(memcached_server_st *ptr);
-LIBMEMCACHED_API
-memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *list);
-
-LIBMEMCACHED_API
-memcached_server_st *memcached_server_list_append(memcached_server_st *ptr, 
-                                                  const char *hostname, 
-                                                  unsigned int port, 
-                                                  memcached_return *error);
-LIBMEMCACHED_API
-memcached_server_st *memcached_server_list_append_with_weight(memcached_server_st *ptr, 
-                                                              const char *hostname, 
-                                                              unsigned int port, 
-                                                              uint32_t weight,
-                                                              memcached_return *error);
-LIBMEMCACHED_API
-unsigned int memcached_server_list_count(memcached_server_st *ptr);
-LIBMEMCACHED_API
-memcached_server_st *memcached_servers_parse(const char *server_strings);
-
+memcached_server_st *memcached_server_get_last_disconnect(memcached_st *ptr);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* LIBMEMCACHED_MEMCACHED_SERVER_H */
+#endif /* __MEMCACHED_SERVER_H__ */