First merge of Trond's patches (cherry picking).

[m6w6/libmemcached] / libmemcached / memcached_server.h

diff --git a/libmemcached/memcached_server.h b/libmemcached/memcached_server.h
index 8076877e0ef84074d2e551c724a7aef4520b1e93..f2d92dc1249517776ed1c34d6e1a7d187c5ab62c 100644 (file)
--- a/libmemcached/memcached_server.h
+++ b/libmemcached/memcached_server.h
@@ -1,9 +1,12 @@
-/*
- * Summary: String structure used for libmemcached.
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker 
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
  *
- * Copy: See Copyright for the status of this software.
+ * Summary: String structure used for libmemcached.
  *
- * Author: Brian Aker
  */
 
 #ifndef __MEMCACHED_SERVER_H__
@@ -14,11 +17,13 @@ extern "C" {
 #endif
 
 struct memcached_server_st {
-  bool is_allocated;
+  struct {
+    bool is_allocated:1;
+  } options;
   bool sockaddr_inited;
   uint16_t count;
-  unsigned int cursor_active;
-  unsigned int port;
+  uint32_t cursor_active;
+  in_port_t port;
   int cached_errno;
   int fd;
   uint32_t io_bytes_sent; /* # bytes sent since last read */
@@ -27,8 +32,9 @@ struct memcached_server_st {
   uint8_t major_version;
   uint8_t micro_version;
   uint8_t minor_version;
-  memcached_connection type;
+  memcached_connection_t type;
   char *read_ptr;
+  char *cached_server_error;
   size_t read_buffer_length;
   size_t read_data_length;
   size_t write_buffer_offset;
@@ -48,14 +54,20 @@ struct memcached_server_st {
 #define memcached_server_response_count(A) (A)->cursor_active
 
 LIBMEMCACHED_API
-memcached_return memcached_server_cursor(memcached_st *ptr, 
-                                         memcached_server_function *callback,
-                                         void *context,
-                                         unsigned int number_of_callbacks);
+memcached_return_t memcached_server_cursor(memcached_st *ptr,
+                                           memcached_server_fn *callback,
+                                           void *context,
+                                           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);
 
 LIBMEMCACHED_API
-memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key, 
-                                             size_t key_length, memcached_return *error);
+const char *memcached_server_error(memcached_server_st *ptr);
+
+LIBMEMCACHED_API
+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
@@ -64,9 +76,9 @@ 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, 
-                                                  uint32_t weight, memcached_connection type);
+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);
@@ -74,10 +86,13 @@ 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 *error);
+                                         memcached_return_t *error);
+
+LIBMEMCACHED_API
+memcached_return_t memcached_server_remove(memcached_server_st *st_ptr);
 
 LIBMEMCACHED_API
-memcached_return memcached_server_remove(memcached_server_st *st_ptr);
+memcached_server_st *memcached_server_get_last_disconnect(memcached_st *ptr);
 
 #ifdef __cplusplus
 }