memcached.h   memcached.h 
skipping to change at line 63 skipping to change at line 63
MEMCACHED_SERVER_ERROR, MEMCACHED_SERVER_ERROR,
MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE, MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE,
MEMCACHED_DATA_EXISTS, MEMCACHED_DATA_EXISTS,
MEMCACHED_DATA_DOES_NOT_EXIST, MEMCACHED_DATA_DOES_NOT_EXIST,
MEMCACHED_NOTSTORED, MEMCACHED_NOTSTORED,
MEMCACHED_NOTFOUND, MEMCACHED_NOTFOUND,
MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_MEMORY_ALLOCATION_FAILURE,
MEMCACHED_PARTIAL_READ, MEMCACHED_PARTIAL_READ,
MEMCACHED_SOME_ERRORS, MEMCACHED_SOME_ERRORS,
MEMCACHED_NO_SERVERS, MEMCACHED_NO_SERVERS,
MEMCACHED_END,
MEMCACHED_DELETED,
MEMCACHED_VALUE,
MEMCACHED_MAXIMUM_RETURN, /* Always add new error code before */ MEMCACHED_MAXIMUM_RETURN, /* Always add new error code before */
} memcached_return; } memcached_return;
typedef enum { typedef enum {
MEMCACHED_NOT_ALLOCATED= 0, MEMCACHED_NOT_ALLOCATED= 0,
MEMCACHED_ALLOCATED= 1, MEMCACHED_ALLOCATED= 1,
} memcached_allocated; } memcached_allocated;
struct memcached_server_st { struct memcached_server_st {
char *hostname; char *hostname;
skipping to change at line 122 skipping to change at line 125
struct memcached_st { struct memcached_st {
memcached_allocated is_allocated; memcached_allocated is_allocated;
memcached_server_st *hosts; memcached_server_st *hosts;
unsigned int number_of_hosts; unsigned int number_of_hosts;
unsigned int cursor_server; unsigned int cursor_server;
char connected; char connected;
}; };
/* Public API */ /* Public API */
memcached_st *memcached_init(memcached_st *ptr); memcached_st *memcached_create(memcached_st *ptr);
void memcached_deinit(memcached_st *ptr); void memcached_free(memcached_st *ptr);
memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_ length, memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_ length,
time_t expiration); time_t expiration);
memcached_return memcached_increment(memcached_st *ptr, memcached_return memcached_increment(memcached_st *ptr,
char *key, size_t key_length, char *key, size_t key_length,
unsigned int offset, unsigned int offset,
unsigned int *value); unsigned int *value);
memcached_return memcached_decrement(memcached_st *ptr, memcached_return memcached_decrement(memcached_st *ptr,
char *key, size_t key_length, char *key, size_t key_length,
unsigned int offset, unsigned int offset,
skipping to change at line 178 skipping to change at line 181
/* Server Public functions */ /* Server Public functions */
#define memcached_server_count(A) A->number_of_hosts #define memcached_server_count(A) A->number_of_hosts
#define memcached_server_name(A,B) B.hostname #define memcached_server_name(A,B) B.hostname
#define memcached_server_port(A,B) B.port #define memcached_server_port(A,B) B.port
#define memcached_server_list(A) A->hosts #define memcached_server_list(A) A->hosts
memcached_return memcached_server_add(memcached_st *ptr, char *hostname, memcached_return memcached_server_add(memcached_st *ptr, char *hostname,
unsigned int port); unsigned int port);
memcached_server_st *memcached_server_list_append(memcached_server_st *ptr,
char *hostname, unsigned int p
ort,
memcached_return *error);
void memcached_server_list_free(memcached_server_st *ptr);
memcached_return memcached_server_push(memcached_st *ptr, memcached_server_
st *list);
unsigned int memcached_server_list_count(memcached_server_st *ptr);
/* These are all private, do not use. */ /* These are all private, do not use. */
memcached_return memcached_connect(memcached_st *ptr); memcached_return memcached_connect(memcached_st *ptr);
memcached_return memcached_response(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 server_key);
unsigned int memcached_generate_hash(char *key, size_t key_length); unsigned int memcached_generate_hash(char *key, size_t key_length);
char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat, char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat,
char *key, memcached_return *error); char *key, memcached_return *error);
char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat, char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat,
memcached_return *error); memcached_return *error);
/* String Struct */ /* String Struct */
#define memcached_string_length(A, B) (size_t)(B->end - B->string) #define memcached_string_length(A, B) (size_t)(B->end - B->string)
#define memcached_string_size(A, B) B->current_size #define memcached_string_size(A, B) B->current_size
#define memcached_string_value(A, B) B->string #define memcached_string_value(A, B) B->string
memcached_string_st *memcached_string_init(memcached_st *ptr, size_t initia l_size); memcached_string_st *memcached_string_create(memcached_st *ptr, size_t init ial_size);
memcached_return memcached_string_append_character(memcached_st *ptr, memcached_return memcached_string_append_character(memcached_st *ptr,
memcached_string_st *str ing, memcached_string_st *str ing,
char character); char character);
memcached_return memcached_string_append(memcached_st *ptr, memcached_strin g_st *string, memcached_return memcached_string_append(memcached_st *ptr, memcached_strin g_st *string,
char *value, size_t length); char *value, size_t length);
size_t memcached_string_backspace(memcached_st *ptr, memcached_string_st *s tring, size_t remove); size_t memcached_string_backspace(memcached_st *ptr, memcached_string_st *s tring, size_t remove);
memcached_return memcached_string_reset(memcached_st *ptr, memcached_string _st *string); memcached_return memcached_string_reset(memcached_st *ptr, memcached_string _st *string);
void memcached_string_free(memcached_st *ptr, memcached_string_st *string); void memcached_string_free(memcached_st *ptr, memcached_string_st *string);
/* Some personal debugging functions */ /* Some personal debugging functions */
#define WATCHPOINT printf("WATCHPOINT %s:%d\n", __FILE__, __LINE__);fflush( stdout); #define WATCHPOINT printf("WATCHPOINT %s:%d\n", __FILE__, __LINE__);fflush( stdout);
#define WATCHPOINT_ERROR(A) printf("WATCHPOINT %s:%d %s\n", __FILE__, __LIN E__, memcached_strerror(NULL, A));fflush(stdout); #define WATCHPOINT_ERROR(A) printf("WATCHPOINT %s:%d %s\n", __FILE__, __LIN E__, memcached_strerror(NULL, A));fflush(stdout);
#define WATCHPOINT_STRING(A) printf("WATCHPOINT %s:%d %s\n", __FILE__, __LI
NE__, A);fflush(stdout);
#define WATCHPOINT_NUMBER(A) printf("WATCHPOINT %s:%d %d\n", __FILE__, __LI
NE__, A);fflush(stdout);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* __MEMCACHED_H__ */ #endif /* __MEMCACHED_H__ */
 End of changes. 5 change blocks. 
3 lines changed or deleted 19 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/