add error reporting to tools, and link memcached_strerror into library

[m6w6/libmemcached] / include / memcached.h

diff --git a/include/memcached.h b/include/memcached.h
index b57b39416a9cee8c0e92af36d755bc1a79cbafa8..da704b19091dddb68b510eafa6eedccf0d43acf4 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -1,4 +1,3 @@
-#include <brian.h>
 /*
  * Summary: interface for memcached server
  * Description: main include file for libmemcached
@@ -37,6 +36,8 @@ typedef struct memcached_host_st memcached_host_st;
 #define MEMCACHED_DEFAULT_COMMAND_SIZE 350
 #define HUGE_STRING_LEN 8196
 
+#define WATCHPOINT printf("WATCHPOINT %s:%d\n", __FILE__, __LINE__);fflush(stdout);
+
 typedef enum {
   MEMCACHED_SUCCESS,
   MEMCACHED_FAILURE,
@@ -56,6 +57,7 @@ typedef enum {
   MEMCACHED_NOTFOUND,
   MEMCACHED_MEMORY_ALLOCATION_FAILURE,
   MEMCACHED_PARTIAL_READ,
+  MEMCACHED_SOME_ERRORS,
 } memcached_return;
 
 typedef enum {
@@ -123,11 +125,15 @@ memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_leng
                                    uint16_t  flags);
 memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
                                   time_t expiration);
-memcached_return memcached_increment(memcached_st *ptr, char *key, size_t key_length,
-                                     unsigned int count);
-memcached_return memcached_decrement(memcached_st *ptr, char *key, size_t key_length,
-                                     unsigned int count);
-memcached_stat_st **memcached_stat(memcached_st *ptr, memcached_return *error);
+memcached_return memcached_increment(memcached_st *ptr, 
+                                     char *key, size_t key_length,
+                                     unsigned int offset,
+                                     unsigned int *value);
+memcached_return memcached_decrement(memcached_st *ptr, 
+                                     char *key, size_t key_length,
+                                     unsigned int offset,
+                                     unsigned int *value);
+memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return *error);
 memcached_return memcached_stat_hostname(memcached_stat_st *stat, char *args, 
                                          char *hostname, unsigned int port);
 memcached_return memcached_flush(memcached_st *ptr, time_t expiration);
@@ -143,8 +149,9 @@ char *memcached_strerror(memcached_st *ptr, memcached_return rc);
 /* These are all private, do not use. */
 memcached_return memcached_connect(memcached_st *ptr);
 memcached_return memcached_response(memcached_st *ptr, 
-                                    char *buffer, 
-                                    size_t buffer_length);
+                                    char *buffer, size_t buffer_length,
+                                    unsigned int server_key);
+unsigned int memcached_generate_hash(char *key, size_t key_length);
 
 #ifdef __cplusplus
 }