memcached.h   memcached.h 
skipping to change at line 33 skipping to change at line 33
#include <libmemcached/memcached_string.h> #include <libmemcached/memcached_string.h>
#include <libmemcached/memcached_result.h> #include <libmemcached/memcached_result.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* These are Private and should not be used by applications */ /* These are Private and should not be used by applications */
#define MEMCACHED_VERSION_STRING_LENGTH 12 #define MEMCACHED_VERSION_STRING_LENGTH 12
/* Public defines */
#define MEMCACHED_DEFAULT_PORT 11211
#define MEMCACHED_MAX_KEY 251 /* We add one to have it null terminated */
#define MEMCACHED_MAX_BUFFER 8196
#define MEMCACHED_MAX_HOST_LENGTH 64
#define MEMCACHED_WHEEL_SIZE 1024
#define MEMCACHED_STRIDE 4
#define MEMCACHED_DEFAULT_TIMEOUT INT32_MAX
/* string value */ /* string value */
#define LIBMEMCACHED_VERSION_STRING "0.18" #define LIBMEMCACHED_VERSION_STRING "0.19"
struct memcached_stat_st { struct memcached_stat_st {
uint32_t pid; uint32_t pid;
uint32_t uptime; uint32_t uptime;
uint32_t threads; uint32_t threads;
uint32_t time; uint32_t time;
uint32_t pointer_size; uint32_t pointer_size;
uint32_t rusage_user_seconds; uint32_t rusage_user_seconds;
uint32_t rusage_user_microseconds; uint32_t rusage_user_microseconds;
uint32_t rusage_system_seconds; uint32_t rusage_system_seconds;
skipping to change at line 94 skipping to change at line 85
memcached_result_st result; memcached_result_st result;
memcached_hash hash; memcached_hash hash;
memcached_server_distribution distribution; memcached_server_distribution distribution;
void *user_data; void *user_data;
unsigned int wheel[MEMCACHED_WHEEL_SIZE]; unsigned int wheel[MEMCACHED_WHEEL_SIZE];
memcached_clone_func on_clone; memcached_clone_func on_clone;
memcached_cleanup_func on_cleanup; memcached_cleanup_func on_cleanup;
memcached_free_function call_free; memcached_free_function call_free;
memcached_malloc_function call_malloc; memcached_malloc_function call_malloc;
memcached_realloc_function call_realloc; memcached_realloc_function call_realloc;
memcached_trigger_key get_key_failure;
memcached_trigger_delete_key delete_trigger;
#ifdef NOT_USED /* Future Use */ #ifdef NOT_USED /* Future Use */
uint8_t replicas; uint8_t replicas;
memcached_return warning; memcached_return warning;
#endif #endif
}; };
/* Public API */ /* Public API */
const char * memcached_lib_version(void); const char * memcached_lib_version(void);
memcached_st *memcached_create(memcached_st *ptr); memcached_st *memcached_create(memcached_st *ptr);
skipping to change at line 128 skipping to change at line 121
memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_ return *error); memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_ return *error);
memcached_return memcached_stat_servername(memcached_stat_st *stat, char *a rgs, memcached_return memcached_stat_servername(memcached_stat_st *stat, char *a rgs,
char *hostname, unsigned int por t); char *hostname, unsigned int por t);
memcached_return memcached_flush(memcached_st *ptr, time_t expiration); memcached_return memcached_flush(memcached_st *ptr, time_t expiration);
memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbos ity); memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbos ity);
void memcached_quit(memcached_st *ptr); void memcached_quit(memcached_st *ptr);
char *memcached_strerror(memcached_st *ptr, memcached_return rc); char *memcached_strerror(memcached_st *ptr, memcached_return rc);
memcached_return memcached_behavior_set(memcached_st *ptr, memcached_behavi or flag, uint64_t data); memcached_return memcached_behavior_set(memcached_st *ptr, memcached_behavi or flag, uint64_t data);
uint64_t memcached_behavior_get(memcached_st *ptr, memcached_behavior flag) ; uint64_t memcached_behavior_get(memcached_st *ptr, memcached_behavior flag) ;
/* All of the functions for adding data to the server */
memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_len
gth,
char *value, size_t value_length,
time_t expiration,
uint32_t flags);
memcached_return memcached_add(memcached_st *ptr, char *key, size_t key_len
gth,
char *value, size_t value_length,
time_t expiration,
uint32_t flags);
memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key
_length,
char *value, size_t value_length,
time_t expiration,
uint32_t flags);
memcached_return memcached_append(memcached_st *ptr,
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
uint32_t flags);
memcached_return memcached_prepend(memcached_st *ptr,
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
uint32_t flags);
memcached_return memcached_cas(memcached_st *ptr,
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
uint32_t flags,
uint64_t cas);
/* Get functions */ /* Get functions */
char *memcached_get(memcached_st *ptr, char *key, size_t key_length, char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
size_t *value_length, size_t *value_length,
uint32_t *flags, uint32_t *flags,
memcached_return *error); memcached_return *error);
memcached_return memcached_mget(memcached_st *ptr, memcached_return memcached_mget(memcached_st *ptr,
char **keys, size_t *key_length, char **keys, size_t *key_length,
unsigned int number_of_keys); unsigned int number_of_keys);
char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length, char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
size_t *value_length, uint32_t *flags, size_t *value_length, uint32_t *flags,
skipping to change at line 208 skipping to change at line 171
char *key, size_t key_length, char *key, size_t key_length,
size_t *value_length, size_t *value_length,
uint32_t *flags, uint32_t *flags,
memcached_return *error); memcached_return *error);
memcached_return memcached_mget_by_key(memcached_st *ptr, memcached_return memcached_mget_by_key(memcached_st *ptr,
char *master_key, size_t master_key_ length, char *master_key, size_t master_key_ length,
char **keys, size_t *key_length, char **keys, size_t *key_length,
unsigned int number_of_keys); unsigned int number_of_keys);
memcached_return memcached_set_by_key(memcached_st *ptr,
char *master_key, size_t master_key_l
ength,
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
uint32_t flags);
memcached_return memcached_add_by_key(memcached_st *ptr,
char *master_key, size_t master_key_l
ength,
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
uint32_t flags);
memcached_return memcached_replace_by_key(memcached_st *ptr,
char *master_key, size_t master_k
ey_length,
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
uint32_t flags);
memcached_return memcached_prepend_by_key(memcached_st *ptr,
char *master_key, size_t master_k
ey_length,
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
uint32_t flags);
memcached_return memcached_append_by_key(memcached_st *ptr,
char *master_key, size_t master_ke
y_length,
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
uint32_t flags);
memcached_return memcached_cas_by_key(memcached_st *ptr,
char *master_key, size_t master_key_l
ength,
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
uint32_t flags,
uint64_t cas);
memcached_return memcached_delete_by_key(memcached_st *ptr, memcached_return memcached_delete_by_key(memcached_st *ptr,
char *master_key, size_t master_ke y_length, char *master_key, size_t master_ke y_length,
char *key, size_t key_length, char *key, size_t key_length,
time_t expiration); time_t expiration);
memcached_return memcached_fetch_execute(memcached_st *ptr, memcached_return memcached_fetch_execute(memcached_st *ptr,
unsigned int (*callback[])(mem cached_st *ptr, memcached_result_st *result, void *context), unsigned int (*callback[])(mem cached_st *ptr, memcached_result_st *result, void *context),
void *context, void *context,
unsigned int number_of_callbac ks unsigned int number_of_callbac ks
); );
skipping to change at line 277 skipping to change at line 198
memcached_return memcached_server_cursor(memcached_st *ptr, memcached_return memcached_server_cursor(memcached_st *ptr,
memcached_server_function *callbac k, memcached_server_function *callbac k,
void *context, void *context,
unsigned int number_of_callbacks); unsigned int number_of_callbacks);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#include <libmemcached/memcached_storage.h>
#endif /* __MEMCACHED_H__ */ #endif /* __MEMCACHED_H__ */
 End of changes. 6 change blocks. 
91 lines changed or deleted 5 lines changed or added


 memcached_constants.h   memcached_constants.h 
skipping to change at line 93 skipping to change at line 93
MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT,
} memcached_behavior; } memcached_behavior;
typedef enum { typedef enum {
MEMCACHED_CALLBACK_USER_DATA, MEMCACHED_CALLBACK_USER_DATA,
MEMCACHED_CALLBACK_CLEANUP_FUNCTION, MEMCACHED_CALLBACK_CLEANUP_FUNCTION,
MEMCACHED_CALLBACK_CLONE_FUNCTION, MEMCACHED_CALLBACK_CLONE_FUNCTION,
MEMCACHED_CALLBACK_MALLOC_FUNCTION, MEMCACHED_CALLBACK_MALLOC_FUNCTION,
MEMCACHED_CALLBACK_REALLOC_FUNCTION, MEMCACHED_CALLBACK_REALLOC_FUNCTION,
MEMCACHED_CALLBACK_FREE_FUNCTION, MEMCACHED_CALLBACK_FREE_FUNCTION,
MEMCACHED_CALLBACK_GET_FAILURE,
MEMCACHED_CALLBACK_DELETE_TRIGGER,
} memcached_callback; } memcached_callback;
typedef enum { typedef enum {
MEMCACHED_HASH_DEFAULT= 0, MEMCACHED_HASH_DEFAULT= 0,
MEMCACHED_HASH_MD5, MEMCACHED_HASH_MD5,
MEMCACHED_HASH_CRC, MEMCACHED_HASH_CRC,
MEMCACHED_HASH_FNV1_64, MEMCACHED_HASH_FNV1_64,
MEMCACHED_HASH_FNV1A_64, MEMCACHED_HASH_FNV1A_64,
MEMCACHED_HASH_FNV1_32, MEMCACHED_HASH_FNV1_32,
MEMCACHED_HASH_FNV1A_32, MEMCACHED_HASH_FNV1A_32,
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 memcached_result.h   memcached_result.h 
skipping to change at line 24 skipping to change at line 24
#endif #endif
struct memcached_result_st { struct memcached_result_st {
memcached_allocated is_allocated; memcached_allocated is_allocated;
memcached_st *root; memcached_st *root;
char key[MEMCACHED_MAX_KEY]; char key[MEMCACHED_MAX_KEY];
size_t key_length; size_t key_length;
memcached_string_st value; memcached_string_st value;
uint32_t flags; uint32_t flags;
uint64_t cas; uint64_t cas;
time_t expiration;
/* Add result callback function */ /* Add result callback function */
}; };
/* Result Struct */ /* Result Struct */
void memcached_result_free(memcached_result_st *result); void memcached_result_free(memcached_result_st *result);
void memcached_result_reset(memcached_result_st *ptr);
memcached_result_st *memcached_result_create(memcached_st *ptr, memcached_result_st *memcached_result_create(memcached_st *ptr,
memcached_result_st *result); memcached_result_st *result);
#define memcached_result_key_value(A) (A)->key #define memcached_result_key_value(A) (A)->key
#define memcached_result_key_length(A) (A)->key_length #define memcached_result_key_length(A) (A)->key_length
#ifdef FIX #ifdef FIX
#define memcached_result_value(A) memcached_string_value((A)->value) #define memcached_result_value(A) memcached_string_value((A)->value)
#define memcached_result_length(A) memcached_string_length((A)->value) #define memcached_result_length(A) memcached_string_length((A)->value)
#else #else
char *memcached_result_value(memcached_result_st *ptr); char *memcached_result_value(memcached_result_st *ptr);
size_t memcached_result_length(memcached_result_st *ptr); size_t memcached_result_length(memcached_result_st *ptr);
#endif #endif
#define memcached_result_flags(A) (A)->flags #define memcached_result_flags(A) (A)->flags
#define memcached_result_cas(A) (A)->cas #define memcached_result_cas(A) (A)->cas
memcached_return memcached_result_set_value(memcached_result_st *ptr, char
*value, size_t length);
#define memcached_result_set_flags(A,B) (A)->flags=(B)
#define memcached_result_set_expiration(A,B) (A)->expiration=(B)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* __MEMCACHED_RESULT_H__ */ #endif /* __MEMCACHED_RESULT_H__ */
 End of changes. 3 change blocks. 
0 lines changed or deleted 6 lines changed or added


 memcached_types.h   memcached_types.h 
skipping to change at line 28 skipping to change at line 28
typedef struct memcached_result_st memcached_result_st; typedef struct memcached_result_st memcached_result_st;
typedef struct memcached_string_st memcached_string_st; typedef struct memcached_string_st memcached_string_st;
typedef struct memcached_server_st memcached_server_st; typedef struct memcached_server_st memcached_server_st;
typedef memcached_return (*memcached_clone_func)(memcached_st *parent, memc ached_st *clone); typedef memcached_return (*memcached_clone_func)(memcached_st *parent, memc ached_st *clone);
typedef memcached_return (*memcached_cleanup_func)(memcached_st *ptr); typedef memcached_return (*memcached_cleanup_func)(memcached_st *ptr);
typedef void (*memcached_free_function)(memcached_st *ptr, void *mem); typedef void (*memcached_free_function)(memcached_st *ptr, void *mem);
typedef void *(*memcached_malloc_function)(memcached_st *ptr, const size_t size); typedef void *(*memcached_malloc_function)(memcached_st *ptr, const size_t size);
typedef void *(*memcached_realloc_function)(memcached_st *ptr, void *mem, c onst size_t size); typedef void *(*memcached_realloc_function)(memcached_st *ptr, void *mem, c onst size_t size);
typedef memcached_return (*memcached_execute_function)(memcached_st *ptr, m emcached_result_st *result, void *context); typedef memcached_return (*memcached_execute_function)(memcached_st *ptr, m emcached_result_st *result, void *context);
typedef memcached_return (*memcached_server_function)(memcached_st *ptr, me mcached_server_st *server, void *context); typedef memcached_return (*memcached_server_function)(memcached_st *ptr, me mcached_server_st *server, void *context);
typedef memcached_return (*memcached_trigger_key)(memcached_st *ptr,
char *key, size_t key_len
gth,
memcached_result_st *resu
lt);
typedef memcached_return (*memcached_trigger_delete_key)(memcached_st *ptr,
char *key, size_t
key_length);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* __MEMCACHED_TYPES_H__ */ #endif /* __MEMCACHED_TYPES_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 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/