memcached.h   memcached.h 
skipping to change at line 35 skipping to change at line 35
/* Public defines */ /* Public defines */
#define MEMCACHED_DEFAULT_PORT 11211 #define MEMCACHED_DEFAULT_PORT 11211
#define MEMCACHED_MAX_KEY 251 /* We add one to have it null terminated */ #define MEMCACHED_MAX_KEY 251 /* We add one to have it null terminated */
#define MEMCACHED_MAX_BUFFER 8196 #define MEMCACHED_MAX_BUFFER 8196
#define MEMCACHED_MAX_HOST_LENGTH 64 #define MEMCACHED_MAX_HOST_LENGTH 64
#define MEMCACHED_WHEEL_SIZE 1024 #define MEMCACHED_WHEEL_SIZE 1024
#define MEMCACHED_STRIDE 4 #define MEMCACHED_STRIDE 4
#define MEMCACHED_DEFAULT_TIMEOUT INT32_MAX #define MEMCACHED_DEFAULT_TIMEOUT INT32_MAX
/* string value */ /* string value */
#define LIBMEMCACHED_VERSION_STRING "0.14" #define LIBMEMCACHED_VERSION_STRING "0.16"
typedef enum { typedef enum {
MEMCACHED_SUCCESS, MEMCACHED_SUCCESS,
MEMCACHED_FAILURE, MEMCACHED_FAILURE,
MEMCACHED_HOST_LOOKUP_FAILURE, MEMCACHED_HOST_LOOKUP_FAILURE,
MEMCACHED_CONNECTION_FAILURE, MEMCACHED_CONNECTION_FAILURE,
MEMCACHED_CONNECTION_BIND_FAILURE, MEMCACHED_CONNECTION_BIND_FAILURE,
MEMCACHED_WRITE_FAILURE, MEMCACHED_WRITE_FAILURE,
MEMCACHED_READ_FAILURE, MEMCACHED_READ_FAILURE,
MEMCACHED_UNKNOWN_READ_FAILURE, MEMCACHED_UNKNOWN_READ_FAILURE,
skipping to change at line 70 skipping to change at line 70
MEMCACHED_DELETED, MEMCACHED_DELETED,
MEMCACHED_VALUE, MEMCACHED_VALUE,
MEMCACHED_STAT, MEMCACHED_STAT,
MEMCACHED_ERRNO, MEMCACHED_ERRNO,
MEMCACHED_FAIL_UNIX_SOCKET, MEMCACHED_FAIL_UNIX_SOCKET,
MEMCACHED_NOT_SUPPORTED, MEMCACHED_NOT_SUPPORTED,
MEMCACHED_NO_KEY_PROVIDED, MEMCACHED_NO_KEY_PROVIDED,
MEMCACHED_FETCH_NOTFINISHED, MEMCACHED_FETCH_NOTFINISHED,
MEMCACHED_TIMEOUT, MEMCACHED_TIMEOUT,
MEMCACHED_BUFFERED, MEMCACHED_BUFFERED,
MEMCACHED_BAD_KEY_PROVIDED,
MEMCACHED_MAXIMUM_RETURN, /* Always add new error code before */ MEMCACHED_MAXIMUM_RETURN, /* Always add new error code before */
} memcached_return; } memcached_return;
typedef struct memcached_st memcached_st; typedef struct memcached_st memcached_st;
typedef struct memcached_stat_st memcached_stat_st; typedef struct memcached_stat_st memcached_stat_st;
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);
skipping to change at line 102 skipping to change at line 103
MEMCACHED_BEHAVIOR_HASH, MEMCACHED_BEHAVIOR_HASH,
MEMCACHED_BEHAVIOR_KETAMA, MEMCACHED_BEHAVIOR_KETAMA,
MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE,
MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE,
MEMCACHED_BEHAVIOR_CACHE_LOOKUPS, MEMCACHED_BEHAVIOR_CACHE_LOOKUPS,
MEMCACHED_BEHAVIOR_SUPPORT_CAS, MEMCACHED_BEHAVIOR_SUPPORT_CAS,
MEMCACHED_BEHAVIOR_POLL_TIMEOUT, MEMCACHED_BEHAVIOR_POLL_TIMEOUT,
MEMCACHED_BEHAVIOR_DISTRIBUTION, MEMCACHED_BEHAVIOR_DISTRIBUTION,
MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS,
MEMCACHED_BEHAVIOR_USER_DATA, MEMCACHED_BEHAVIOR_USER_DATA,
MEMCACHED_BEHAVIOR_SORT_HOSTS,
MEMCACHED_BEHAVIOR_VERIFY_KEY,
} 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; } memcached_callback;
skipping to change at line 172 skipping to change at line 175
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;
uint32_t rusage_system_microseconds; uint32_t rusage_system_microseconds;
uint32_t curr_items; uint32_t curr_items;
uint32_t total_items; uint32_t total_items;
uint32_t limit_maxbytes; uint64_t limit_maxbytes;
uint32_t curr_connections; uint32_t curr_connections;
uint32_t total_connections; uint32_t total_connections;
uint32_t connection_structures; uint32_t connection_structures;
uint64_t bytes; uint64_t bytes;
uint64_t cmd_get; uint64_t cmd_get;
uint64_t cmd_set; uint64_t cmd_set;
uint64_t get_hits; uint64_t get_hits;
uint64_t get_misses; uint64_t get_misses;
uint64_t evictions; uint64_t evictions;
uint64_t bytes_read; uint64_t bytes_read;
 End of changes. 4 change blocks. 
2 lines changed or deleted 5 lines changed or added


 memcached.hh   memcached.hh 
skipping to change at line 36 skipping to change at line 36
char *get(char *key, size_t *value_length) char *get(char *key, size_t *value_length)
{ {
uint32_t flags; uint32_t flags;
memcached_return rc; memcached_return rc;
return memcached_get(&memc, key, strlen(key), return memcached_get(&memc, key, strlen(key),
value_length, &flags, &rc); value_length, &flags, &rc);
} }
char *get_by_key(char *master_key, char *key, size_t *value_length)
{
uint32_t flags;
memcached_return rc;
return memcached_get_by_key(&memc, master_key, strlen(master_key), key,
strlen(key),
value_length, &flags, &rc);
}
memcached_return mget(char **keys, size_t *key_length, unsigned int numbe
r_of_keys)
{
return memcached_mget(&memc, keys, key_length, number_of_keys);
}
memcached_return set(char *key, char *value, size_t value_length) memcached_return set(char *key, char *value, size_t value_length)
{ {
return memcached_set(&memc, key, strlen(key), return memcached_set(&memc, key, strlen(key),
value, value_length, value, value_length,
(time_t)0, (uint32_t)0); (time_t)0, (uint32_t)0);
} }
memcached_return set_by_key(char *master_key, char *key, char *value, siz
e_t value_length)
{
return memcached_set_by_key(&memc, master_key, strlen(master_key),
key, strlen(key),
value, value_length,
(time_t)0,
(uint32_t)0 );
}
memcached_return add(char *key, char *value, size_t value_length) memcached_return add(char *key, char *value, size_t value_length)
{ {
return memcached_add(&memc, key, strlen(key), return memcached_add(&memc, key, strlen(key),
value, value_length, value, value_length,
(time_t)0, (uint32_t)0); (time_t)0, (uint32_t)0);
} }
memcached_return replace(char *key, char *value, size_t value_length) memcached_return replace(char *key, char *value, size_t value_length)
{ {
return memcached_replace(&memc, key, strlen(key), return memcached_replace(&memc, key, strlen(key),
 End of changes. 2 change blocks. 
0 lines changed or deleted 27 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/