memcached.h   memcached.h 
skipping to change at line 36 skipping to change at line 36
#include <libmemcached/memcached_server.h> #include <libmemcached/memcached_server.h>
#include <libmemcached/memcached_string.h> #include <libmemcached/memcached_string.h>
#include <libmemcached/memcached_result.h> #include <libmemcached/memcached_result.h>
#include <libmemcached/memcached_storage.h> #include <libmemcached/memcached_storage.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#define MEMCACHED_VERSION_STRING_LENGTH 24 #define MEMCACHED_VERSION_STRING_LENGTH 24
#define LIBMEMCACHED_VERSION_STRING "0.31" #define LIBMEMCACHED_VERSION_STRING "0.32"
struct memcached_analysis_st { struct memcached_analysis_st {
uint32_t average_item_size; uint32_t average_item_size;
uint32_t longest_uptime; uint32_t longest_uptime;
uint32_t least_free_server; uint32_t least_free_server;
uint32_t most_consumed_server; uint32_t most_consumed_server;
uint32_t oldest_server; uint32_t oldest_server;
double pool_hit_ratio; double pool_hit_ratio;
uint64_t most_used_bytes; uint64_t most_used_bytes;
uint64_t least_remaining_bytes; uint64_t least_remaining_bytes;
skipping to change at line 166 skipping to change at line 166
size_t key_length, size_t key_length,
uint64_t offset, uint64_t offset,
uint64_t initial, uint64_t initial,
time_t expiration, time_t expiration,
uint64_t *value); uint64_t *value);
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_stat_free(memcached_st *, memcached_stat_st *); void memcached_stat_free(memcached_st *, memcached_stat_st *);
LIBMEMCACHED_API LIBMEMCACHED_API
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);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return memcached_stat_servername(memcached_stat_st *stat, char *a rgs, memcached_return memcached_stat_servername(memcached_stat_st *memc_stat, ch ar *args,
char *hostname, unsigned int por t); char *hostname, unsigned int por t);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return memcached_flush(memcached_st *ptr, time_t expiration); memcached_return memcached_flush(memcached_st *ptr, time_t expiration);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbos ity); memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbos ity);
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_quit(memcached_st *ptr); void memcached_quit(memcached_st *ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
char *memcached_strerror(memcached_st *ptr, memcached_return rc); const char *memcached_strerror(memcached_st *ptr, memcached_return rc);
LIBMEMCACHED_API LIBMEMCACHED_API
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);
LIBMEMCACHED_API LIBMEMCACHED_API
uint64_t memcached_behavior_get(memcached_st *ptr, memcached_behavior flag) ; uint64_t memcached_behavior_get(memcached_st *ptr, memcached_behavior flag) ;
/* The two public hash bits */ /* The two public hash bits */
LIBMEMCACHED_API LIBMEMCACHED_API
uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memcached_hash hash_algorithm); uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memcached_hash hash_algorithm);
LIBMEMCACHED_API LIBMEMCACHED_API
uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_length); uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_length);
skipping to change at line 238 skipping to change at line 238
const char *h ostname, const char *h ostname,
unsigned int port, unsigned int port,
uint32_t weig ht, uint32_t weig ht,
memcached_ret urn *error); memcached_ret urn *error);
LIBMEMCACHED_API LIBMEMCACHED_API
unsigned int memcached_server_list_count(memcached_server_st *ptr); unsigned int memcached_server_list_count(memcached_server_st *ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_server_st *memcached_servers_parse(const char *server_strings); memcached_server_st *memcached_servers_parse(const char *server_strings);
LIBMEMCACHED_API LIBMEMCACHED_API
char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat, char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *memc_s tat,
const char *key, memcached_return *error); const char *key, memcached_return *error);
LIBMEMCACHED_API LIBMEMCACHED_API
char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat, char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *memc_ stat,
memcached_return *error); memcached_return *error);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return memcached_delete_by_key(memcached_st *ptr, memcached_return memcached_delete_by_key(memcached_st *ptr,
const char *master_key, size_t mas ter_key_length, const char *master_key, size_t mas ter_key_length,
const char *key, size_t key_length , const char *key, size_t key_length ,
time_t expiration); time_t expiration);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return memcached_fetch_execute(memcached_st *ptr, memcached_return memcached_fetch_execute(memcached_st *ptr,
 End of changes. 5 change blocks. 
5 lines changed or deleted 5 lines changed or added


 memcached_get.h   memcached_get.h 
skipping to change at line 26 skipping to change at line 26
/* Public defines */ /* Public defines */
LIBMEMCACHED_API LIBMEMCACHED_API
char *memcached_get(memcached_st *ptr, char *memcached_get(memcached_st *ptr,
const char *key, size_t key_length, const 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);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return memcached_mget(memcached_st *ptr, memcached_return memcached_mget(memcached_st *ptr,
char **keys, size_t *key_length, const char **keys, size_t *key_length,
unsigned int number_of_keys); size_t number_of_keys);
LIBMEMCACHED_API LIBMEMCACHED_API
char *memcached_get_by_key(memcached_st *ptr, char *memcached_get_by_key(memcached_st *ptr,
const char *master_key, size_t master_key_length , const char *master_key, size_t master_key_length ,
const char *key, size_t key_length, const 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);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return memcached_mget_by_key(memcached_st *ptr, memcached_return memcached_mget_by_key(memcached_st *ptr,
const char *master_key, size_t const char *master_key, size_t
master_key_length, master_key_length,
char **keys, const char **keys,
size_t *key_length, size_t *key_length,
unsigned int number_of_keys); size_t number_of_keys);
LIBMEMCACHED_API LIBMEMCACHED_API
char *memcached_fetch(memcached_st *ptr, char *memcached_fetch(memcached_st *ptr,
char *key, size_t *key_length, char *key, size_t *key_length,
size_t *value_length, uint32_t *flags, size_t *value_length, uint32_t *flags,
memcached_return *error); memcached_return *error);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_result_st *memcached_fetch_result(memcached_st *ptr, memcached_result_st *memcached_fetch_result(memcached_st *ptr,
memcached_result_st *result, memcached_result_st *result,
 End of changes. 3 change blocks. 
4 lines changed or deleted 4 lines changed or added


 memcached_result.h   memcached_result.h 
skipping to change at line 51 skipping to change at line 51
#define memcached_result_length(A) memcached_string_length((A)->value) #define memcached_result_length(A) memcached_string_length((A)->value)
#else #else
LIBMEMCACHED_API LIBMEMCACHED_API
char *memcached_result_value(memcached_result_st *ptr); char *memcached_result_value(memcached_result_st *ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
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
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return memcached_result_set_value(memcached_result_st *ptr, char *value, size_t length); memcached_return memcached_result_set_value(memcached_result_st *ptr, const char *value, size_t length);
#define memcached_result_set_flags(A,B) (A)->flags=(B) #define memcached_result_set_flags(A,B) (A)->flags=(B)
#define memcached_result_set_expiration(A,B) (A)->expiration=(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. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 memcached_server.h   memcached_server.h 
skipping to change at line 32 skipping to change at line 32
int cached_errno; int cached_errno;
int fd; int fd;
uint32_t io_bytes_sent; /* # bytes sent since last read */ uint32_t io_bytes_sent; /* # bytes sent since last read */
uint32_t server_failure_counter; uint32_t server_failure_counter;
uint32_t weight; uint32_t weight;
uint8_t major_version; uint8_t major_version;
uint8_t micro_version; uint8_t micro_version;
uint8_t minor_version; uint8_t minor_version;
memcached_connection type; memcached_connection type;
char *read_ptr; char *read_ptr;
char *cached_server_error;
size_t read_buffer_length; size_t read_buffer_length;
size_t read_data_length; size_t read_data_length;
size_t write_buffer_offset; size_t write_buffer_offset;
struct addrinfo *address_info; struct addrinfo *address_info;
time_t next_retry; time_t next_retry;
memcached_st *root; memcached_st *root;
uint64_t limit_maxbytes; uint64_t limit_maxbytes;
char read_buffer[MEMCACHED_MAX_BUFFER]; char read_buffer[MEMCACHED_MAX_BUFFER];
char write_buffer[MEMCACHED_MAX_BUFFER]; char write_buffer[MEMCACHED_MAX_BUFFER];
char hostname[MEMCACHED_MAX_HOST_LENGTH]; char hostname[MEMCACHED_MAX_HOST_LENGTH];
skipping to change at line 60 skipping to change at line 61
LIBMEMCACHED_API LIBMEMCACHED_API
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);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key, memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key,
size_t key_length, memcached_r eturn *error); size_t key_length, memcached_r eturn *error);
LIBMEMCACHED_API
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 */ /* These should not currently be used by end users */
/* TODO: Is the above comment valid? If so, how can we unit test these if t hey /* TODO: Is the above comment valid? If so, how can we unit test these if t hey
* aren't exported. If not, we should remove the comment */ * aren't exported. If not, we should remove the comment */
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_server_st *memcached_server_create(memcached_st *memc, memcached_ server_st *ptr); memcached_server_st *memcached_server_create(memcached_st *memc, memcached_ server_st *ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_server_st *memcached_server_create_with(memcached_st *memc, memca ched_server_st *host, memcached_server_st *memcached_server_create_with(memcached_st *memc, memca ched_server_st *host,
const char *hostname, uns igned int port, const char *hostname, uns igned int port,
uint32_t weight, memcache d_connection type); uint32_t weight, memcache d_connection type);
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_server_free(memcached_server_st *ptr); void memcached_server_free(memcached_server_st *ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_server_st *memcached_server_clone(memcached_server_st *clone, mem cached_server_st *ptr); memcached_server_st *memcached_server_clone(memcached_server_st *clone, mem cached_server_st *ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat _st *stat, memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat _st *memc_stat,
memcached_return *error); memcached_return *error);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return memcached_server_remove(memcached_server_st *st_ptr); memcached_return memcached_server_remove(memcached_server_st *st_ptr);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* __MEMCACHED_SERVER_H__ */ #endif /* __MEMCACHED_SERVER_H__ */
 End of changes. 3 change blocks. 
1 lines changed or deleted 8 lines changed or added


 memcached_string.h   memcached_string.h 
skipping to change at line 43 skipping to change at line 43
size_t initial_size); size_t initial_size);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return memcached_string_check(memcached_string_st *string, size_t need); memcached_return memcached_string_check(memcached_string_st *string, size_t need);
LIBMEMCACHED_API LIBMEMCACHED_API
char *memcached_string_c_copy(memcached_string_st *string); char *memcached_string_c_copy(memcached_string_st *string);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return memcached_string_append_character(memcached_string_st *str ing, memcached_return memcached_string_append_character(memcached_string_st *str ing,
char character); char character);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return memcached_string_append(memcached_string_st *string, memcached_return memcached_string_append(memcached_string_st *string,
char *value, size_t length); const char *value, size_t length);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return memcached_string_reset(memcached_string_st *string); memcached_return memcached_string_reset(memcached_string_st *string);
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_string_free(memcached_string_st *string); void memcached_string_free(memcached_string_st *string);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* __MEMCACHED_STRING_H__ */ #endif /* __MEMCACHED_STRING_H__ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 visibility.h   visibility.h 
skipping to change at line 37 skipping to change at line 37
#if defined(BUILDING_LIBMEMCACHED) #if defined(BUILDING_LIBMEMCACHED)
# if defined(HAVE_VISIBILITY) && HAVE_VISIBILITY # if defined(HAVE_VISIBILITY) && HAVE_VISIBILITY
# define LIBMEMCACHED_API __attribute__ ((visibility("default"))) # define LIBMEMCACHED_API __attribute__ ((visibility("default")))
# define LIBMEMCACHED_LOCAL __attribute__ ((visibility("hidden"))) # define LIBMEMCACHED_LOCAL __attribute__ ((visibility("hidden")))
# elif defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550) # elif defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550)
# define LIBMEMCACHED_API __global # define LIBMEMCACHED_API __global
# define LIBMEMCACHED_LOCAL __hidden # define LIBMEMCACHED_LOCAL __hidden
# elif defined(_MSC_VER) # elif defined(_MSC_VER)
# define LIBMEMCACHED_API extern __declspec(dllexport) # define LIBMEMCACHED_API extern __declspec(dllexport)
# define LIBMEMCACHED_LOCAL # define LIBMEMCACHED_LOCAL
# else
# define LIBMEMCACHED_API
# define LIBMEMCACHED_LOCAL
# endif /* defined(HAVE_VISIBILITY) */ # endif /* defined(HAVE_VISIBILITY) */
#else /* defined(BUILDING_LIBMEMCACHED) */ #else /* defined(BUILDING_LIBMEMCACHED) */
# if defined(_MSC_VER) # if defined(_MSC_VER)
# define LIBMEMCACHED_API extern __declspec(dllimport) # define LIBMEMCACHED_API extern __declspec(dllimport)
# define LIBMEMCACHED_LOCAL # define LIBMEMCACHED_LOCAL
# else # else
# define LIBMEMCACHED_API # define LIBMEMCACHED_API
# define LIBMEMCACHED_LOCAL # define LIBMEMCACHED_LOCAL
# endif /* defined(_MSC_VER) */ # endif /* defined(_MSC_VER) */
#endif /* defined(BUILDING_LIBMEMCACHED) */ #endif /* defined(BUILDING_LIBMEMCACHED) */
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 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/