libmemcached_config.h   libmemcached_config.h 
skipping to change at line 22 skipping to change at line 22
/* Enables DTRACE Support */ /* Enables DTRACE Support */
/* #undef HAVE_DTRACE */ /* #undef HAVE_DTRACE */
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1 #define HAVE_INTTYPES_H 1
/* Define to 1 if you have the <memory.h> header file. */ /* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1 #define HAVE_MEMORY_H 1
/* Define to 1 if you have a working SO_RCVTIMEO */
#define HAVE_RCVTIMEO 1
/* Define to 1 if you have a working SO_SNDTIMEO */
#define HAVE_SNDTIMEO 1
/* Define to 1 if you have the <stdint.h> header file. */ /* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1 #define HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */ /* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1 #define HAVE_STDLIB_H 1
/* Define to 1 if you have the <strings.h> header file. */ /* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1 #define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */ /* Define to 1 if you have the <string.h> header file. */
skipping to change at line 43 skipping to change at line 49
/* Define to 1 if you have the <sys/stat.h> header file. */ /* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1 #define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/types.h> header file. */ /* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
/* Name of the memcached binary used in make test */
#define MEMCACHED_BINARY "/usr/bin/memcached"
/* Define to the address where bug reports for this package should be sent. */ /* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "" #define PACKAGE_BUGREPORT ""
/* Define to the full name of this package. */ /* Define to the full name of this package. */
#define PACKAGE_NAME "" #define PACKAGE_NAME ""
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "" #define PACKAGE_STRING ""
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
 End of changes. 2 change blocks. 
0 lines changed or deleted 9 lines changed or added


 memcached.h   memcached.h 
skipping to change at line 15 skipping to change at line 15
* Copy: See Copyright for the status of this software. * Copy: See Copyright for the status of this software.
* *
* Author: Brian Aker * Author: Brian Aker
*/ */
#ifndef __MEMCACHED_H__ #ifndef __MEMCACHED_H__
#define __MEMCACHED_H__ #define __MEMCACHED_H__
#include <stdlib.h> #include <stdlib.h>
#include <inttypes.h> #include <inttypes.h>
#if !defined(__cplusplus)
# include <stdbool.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <netinet/in.h> #include <netinet/in.h>
#ifdef MEMCACHED_INTERNAL #ifdef MEMCACHED_INTERNAL
#include <libmemcached/libmemcached_config.h> #include <libmemcached/libmemcached_config.h>
#endif #endif
#include <libmemcached/memcached_constants.h> #include <libmemcached/memcached_constants.h>
#include <libmemcached/memcached_types.h> #include <libmemcached/memcached_types.h>
#include <libmemcached/memcached_watchpoint.h> #include <libmemcached/memcached_watchpoint.h>
#include <libmemcached/memcached_get.h> #include <libmemcached/memcached_get.h>
skipping to change at line 44 skipping to change at line 47
#define MEMCACHED_VERSION_STRING_LENGTH 12 #define MEMCACHED_VERSION_STRING_LENGTH 12
/* string value */ /* string value */
struct memcached_continuum_item_st { struct memcached_continuum_item_st {
uint32_t index; uint32_t index;
uint32_t value; uint32_t value;
}; };
#define LIBMEMCACHED_VERSION_STRING "0.25" #define LIBMEMCACHED_VERSION_STRING "0.25"
struct memcached_analysis_st {
uint64_t most_used_bytes;
uint64_t least_remaining_bytes;
uint32_t average_item_size;
uint32_t longest_uptime;
uint32_t least_free_server;
uint32_t most_consumed_server;
uint32_t oldest_server;
double pool_hit_ratio;
};
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;
uint32_t rusage_system_microseconds; uint32_t rusage_system_microseconds;
skipping to change at line 73 skipping to change at line 87
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;
uint64_t bytes_written; uint64_t bytes_written;
char version[MEMCACHED_VERSION_STRING_LENGTH]; char version[MEMCACHED_VERSION_STRING_LENGTH];
}; };
struct memcached_st { struct memcached_st {
uint8_t purging; uint8_t purging;
memcached_allocated is_allocated; bool is_allocated;
memcached_server_st *hosts; memcached_server_st *hosts;
uint32_t number_of_hosts; uint32_t number_of_hosts;
uint32_t cursor_server; uint32_t cursor_server;
int cached_errno; int cached_errno;
uint32_t flags; uint32_t flags;
int send_size; int send_size;
int recv_size; int recv_size;
int32_t poll_timeout; int32_t poll_timeout;
int32_t connect_timeout; int32_t connect_timeout;
int32_t retry_timeout; int32_t retry_timeout;
skipping to change at line 135 skipping to change at line 149
void memcached_stat_free(memcached_st *, memcached_stat_st *); void memcached_stat_free(memcached_st *, memcached_stat_st *);
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) ;
uint32_t memcached_generate_hash_value(const char *key, size_t key_length,
memcached_hash hash_algorithm);
memcached_return memcached_flush_buffers(memcached_st *mem);
/* Server Public functions */ /* Server Public functions */
memcached_return memcached_server_add_udp(memcached_st *ptr, memcached_return memcached_server_add_udp(memcached_st *ptr,
const char *hostname, const char *hostname,
unsigned int port); unsigned int port);
memcached_return memcached_server_add_unix_socket(memcached_st *ptr, memcached_return memcached_server_add_unix_socket(memcached_st *ptr,
const char *filename); const char *filename);
memcached_return memcached_server_add(memcached_st *ptr, const char *hostna me, memcached_return memcached_server_add(memcached_st *ptr, const char *hostna me,
unsigned int port); unsigned int port);
skipping to change at line 169 skipping to change at line 185
memcached_server_st *memcached_server_list_append(memcached_server_st *ptr, memcached_server_st *memcached_server_list_append(memcached_server_st *ptr,
const char *hostname, const char *hostname,
unsigned int port, unsigned int port,
memcached_return *error); memcached_return *error);
memcached_server_st *memcached_server_list_append_with_weight(memcached_ser ver_st *ptr, memcached_server_st *memcached_server_list_append_with_weight(memcached_ser ver_st *ptr,
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);
unsigned int memcached_server_list_count(memcached_server_st *ptr); unsigned int memcached_server_list_count(memcached_server_st *ptr);
memcached_server_st *memcached_servers_parse(char *server_strings); memcached_server_st *memcached_servers_parse(const char *server_strings);
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); const 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);
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);
memcached_return memcached_fetch_execute(memcached_st *ptr, memcached_return memcached_fetch_execute(memcached_st *ptr,
memcached_execute_function *ca llback, memcached_execute_function *ca llback,
 End of changes. 6 change blocks. 
3 lines changed or deleted 20 lines changed or added


 memcached.hh   memcached.hh 
skipping to change at line 33 skipping to change at line 33
memcached_clone(&memc, clone); memcached_clone(&memc, clone);
} }
char *fetch (char *key, size_t *key_length, size_t *value_length) char *fetch (char *key, size_t *key_length, size_t *value_length)
{ {
uint32_t flags; uint32_t flags;
memcached_return rc; memcached_return rc;
return memcached_fetch(&memc, key, key_length, return memcached_fetch(&memc, key, key_length,
value_length, &flags, &rc); value_length, &flags, &rc);
} }
char *get(char *key, size_t *value_length) char *get(const 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) char *get_by_key(const char *master_key, const char *key,
size_t *value_length)
{ {
uint32_t flags; uint32_t flags;
memcached_return rc; memcached_return rc;
return memcached_get_by_key(&memc, master_key, strlen(master_key), key, return memcached_get_by_key(&memc, master_key, strlen(master_key),
strlen(key), key, strlen(key),
value_length, &flags, &rc); value_length, &flags, &rc);
} }
memcached_return mget(char **keys, size_t *key_length, unsigned int numbe memcached_return mget(char **keys, size_t *key_length,
r_of_keys) unsigned int number_of_keys)
{ {
return memcached_mget(&memc, keys, key_length, number_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(const char *key, const char *value, size_t value_len gth)
{ {
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 memcached_return set_by_key(const char *master_key, const char *key,
e_t value_length) const char *value, size_t value_length)
{ {
return memcached_set_by_key(&memc, master_key, strlen(master_key), return memcached_set_by_key(&memc, master_key, strlen(master_key),
key, strlen(key), key, strlen(key),
value, value_length, value, value_length,
(time_t)0, (time_t)0,
(uint32_t)0 ); (uint32_t)0 );
} }
memcached_return memcached_return
increment(char *key, unsigned int offset, uint64_t *value) increment(const char *key, unsigned int offset, uint64_t *value)
{ {
return memcached_increment(&memc, key, strlen(key), return memcached_increment(&memc, key, strlen(key),
offset, value); offset, value);
} }
memcached_return memcached_return
decrement(char *key, unsigned int offset, uint64_t *value) decrement(const char *key, unsigned int offset, uint64_t *value)
{ {
return memcached_decrement(&memc, key, strlen(key), return memcached_decrement(&memc, key, strlen(key),
offset, value); offset, value);
} }
memcached_return add(char *key, char *value, size_t value_length) memcached_return add(const char *key, const char *value, size_t value_len gth)
{ {
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 add_by_key(char *master_key, char *key, char *value, siz memcached_return add_by_key(const char *master_key, const char *key,
e_t value_length) const char *value, size_t value_length)
{ {
return memcached_add_by_key(&memc, master_key, strlen(master_key), return memcached_add_by_key(&memc, master_key, strlen(master_key),
key, strlen(key), 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(const char *key, const char *value,
size_t value_length)
{ {
return memcached_replace(&memc, key, strlen(key), return memcached_replace(&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_by_key(char *master_key, memcached_return replace_by_key(const char *master_key, const char *key,
char *key, char *value, size_t value_leng const char *value, size_t value_length)
th)
{ {
return memcached_replace_by_key(&memc, master_key, strlen(master_key), return memcached_replace_by_key(&memc, master_key, strlen(master_key),
key, strlen(key), key, strlen(key),
value, value_length, value, value_length,
(time_t)0, (uint32_t)0); (time_t)0, (uint32_t)0);
} }
memcached_return prepend(char *key, char *value, size_t value_length) memcached_return prepend(const char *key, const char *value,
size_t value_length)
{ {
return memcached_prepend(&memc, key, strlen(key), return memcached_prepend(&memc, key, strlen(key),
value, value_length, value, value_length,
(time_t)0, (time_t)0,
(uint32_t)0); (uint32_t)0);
} }
memcached_return prepend_by_key(char *master_key, memcached_return prepend_by_key(const char *master_key, const char *key,
char *key, char *value, size_t value_leng const char *value, size_t value_length)
th)
{ {
return memcached_prepend_by_key(&memc, master_key, strlen(master_key), return memcached_prepend_by_key(&memc, master_key, strlen(master_key),
key, strlen(key), key, strlen(key),
value, value_length, value, value_length,
(time_t)0, (time_t)0,
(uint32_t)0); (uint32_t)0);
} }
memcached_return append(char *key, char *value, size_t value_length) memcached_return append(const char *key, const char *value,
size_t value_length)
{ {
return memcached_append(&memc, key, strlen(key), return memcached_append(&memc, key, strlen(key),
value, value_length, value, value_length,
(time_t)0, (time_t)0,
(uint32_t)0); (uint32_t)0);
} }
memcached_return append_by_key(char *master_key, memcached_return append_by_key(const char *master_key, const char *key,
char *key, char *value, size_t value_leng const char *value, size_t value_length)
th)
{ {
return memcached_append_by_key(&memc, return memcached_append_by_key(&memc,
master_key, strlen(master_key), master_key, strlen(master_key),
key, strlen(key), key, strlen(key),
value, value_length, value, value_length,
(time_t)0, (time_t)0,
(uint32_t)0); (uint32_t)0);
} }
memcached_return cas(char *key, char *value, size_t value_length, uint64 memcached_return cas(const char *key, const char *value,
_t cas) size_t value_length, uint64_t cas)
{ {
return memcached_cas(&memc, key, strlen(key), return memcached_cas(&memc, key, strlen(key),
value, value_length, value, value_length,
(time_t)0, (time_t)0,
(uint32_t)0, (uint32_t)0,
cas); cas);
} }
memcached_return cas_by_key(char *master_key, char *key, char *value, memcached_return cas_by_key(const char *master_key, const char *key,
size_t value_length, uint64_t cas) const char *value, size_t value_length,
uint64_t cas)
{ {
return memcached_cas_by_key(&memc, return memcached_cas_by_key(&memc,
master_key, strlen(master_key), master_key, strlen(master_key),
key, strlen(key), key, strlen(key),
value, value_length, value, value_length,
(time_t)0, (time_t)0,
(uint32_t)0, (uint32_t)0,
cas); cas);
} }
// using 'remove' vs. 'delete' since 'delete' is a keyword // using 'remove' vs. 'delete' since 'delete' is a keyword
memcached_return remove(char *key) memcached_return remove(const char *key)
{ {
return memcached_delete (&memc, key, strlen(key), (time_t)0); return memcached_delete (&memc, key, strlen(key), (time_t)0);
} }
memcached_return delete_by_key(char *master_key, char *key) memcached_return delete_by_key(const char *master_key, const char *key)
{ {
return memcached_delete_by_key(&memc, master_key, strlen(master_key), return memcached_delete_by_key(&memc, master_key, strlen(master_key),
key, strlen(key), (time_t)0); key, strlen(key), (time_t)0);
} }
~Memcached() ~Memcached()
{ {
memcached_free(&memc); memcached_free(&memc);
} }
}; };
 End of changes. 21 change blocks. 
36 lines changed or deleted 38 lines changed or added


 memcached_constants.h   memcached_constants.h 
skipping to change at line 59 skipping to change at line 59
MEMCACHED_PARTIAL_READ, MEMCACHED_PARTIAL_READ,
MEMCACHED_SOME_ERRORS, MEMCACHED_SOME_ERRORS,
MEMCACHED_NO_SERVERS, MEMCACHED_NO_SERVERS,
MEMCACHED_END, MEMCACHED_END,
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, /* Deprecated. Use MEMCACHED_BAD_KEY_PROVIDED! */
MEMCACHED_FETCH_NOTFINISHED, MEMCACHED_FETCH_NOTFINISHED,
MEMCACHED_TIMEOUT, MEMCACHED_TIMEOUT,
MEMCACHED_BUFFERED, MEMCACHED_BUFFERED,
MEMCACHED_BAD_KEY_PROVIDED, 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 enum { typedef enum {
MEMCACHED_DISTRIBUTION_MODULA, MEMCACHED_DISTRIBUTION_MODULA,
MEMCACHED_DISTRIBUTION_CONSISTENT, MEMCACHED_DISTRIBUTION_CONSISTENT,
skipping to change at line 99 skipping to change at line 99
MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT,
MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT,
MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED,
MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_BEHAVIOR_KETAMA_HASH,
MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
MEMCACHED_BEHAVIOR_SND_TIMEOUT, MEMCACHED_BEHAVIOR_SND_TIMEOUT,
MEMCACHED_BEHAVIOR_RCV_TIMEOUT, MEMCACHED_BEHAVIOR_RCV_TIMEOUT,
MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT, MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT,
MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK, MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK,
MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK, MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK,
MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY,
MEMCACHED_BEHAVIOR_NOREPLY
} memcached_behavior; } memcached_behavior;
typedef enum { typedef enum {
MEMCACHED_CALLBACK_PREFIX_KEY, MEMCACHED_CALLBACK_PREFIX_KEY,
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,
skipping to change at line 134 skipping to change at line 135
MEMCACHED_HASH_JENKINS MEMCACHED_HASH_JENKINS
} memcached_hash; } memcached_hash;
typedef enum { typedef enum {
MEMCACHED_CONNECTION_UNKNOWN, MEMCACHED_CONNECTION_UNKNOWN,
MEMCACHED_CONNECTION_TCP, MEMCACHED_CONNECTION_TCP,
MEMCACHED_CONNECTION_UDP, MEMCACHED_CONNECTION_UDP,
MEMCACHED_CONNECTION_UNIX_SOCKET MEMCACHED_CONNECTION_UNIX_SOCKET
} memcached_connection; } memcached_connection;
typedef enum {
MEMCACHED_NOT_ALLOCATED,
MEMCACHED_ALLOCATED,
MEMCACHED_USED
} memcached_allocated;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* __MEMCACHED_CONSTANTS_H__ */ #endif /* __MEMCACHED_CONSTANTS_H__ */
 End of changes. 3 change blocks. 
8 lines changed or deleted 3 lines changed or added


 memcached_result.h   memcached_result.h 
skipping to change at line 17 skipping to change at line 17
*/ */
#ifndef __MEMCACHED_RESULT_H__ #ifndef __MEMCACHED_RESULT_H__
#define __MEMCACHED_RESULT_H__ #define __MEMCACHED_RESULT_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
struct memcached_result_st { struct memcached_result_st {
memcached_allocated is_allocated; bool 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; time_t expiration;
/* Add result callback function */ /* Add result callback function */
}; };
 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 17 skipping to change at line 17
*/ */
#ifndef __MEMCACHED_SERVER_H__ #ifndef __MEMCACHED_SERVER_H__
#define __MEMCACHED_SERVER_H__ #define __MEMCACHED_SERVER_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
struct memcached_server_st { struct memcached_server_st {
memcached_allocated is_allocated; bool is_allocated;
char hostname[MEMCACHED_MAX_HOST_LENGTH]; char hostname[MEMCACHED_MAX_HOST_LENGTH];
unsigned int port; unsigned int port;
int fd; int fd;
int cached_errno; int cached_errno;
unsigned int cursor_active; unsigned int cursor_active;
char write_buffer[MEMCACHED_MAX_BUFFER]; char write_buffer[MEMCACHED_MAX_BUFFER];
size_t write_buffer_offset; size_t write_buffer_offset;
char read_buffer[MEMCACHED_MAX_BUFFER]; char read_buffer[MEMCACHED_MAX_BUFFER];
size_t read_data_length; size_t read_data_length;
size_t read_buffer_length; size_t read_buffer_length;
char *read_ptr; char *read_ptr;
memcached_allocated sockaddr_inited; bool sockaddr_inited;
struct addrinfo *address_info; struct addrinfo *address_info;
memcached_connection type; memcached_connection type;
uint8_t major_version; uint8_t major_version;
uint8_t minor_version; uint8_t minor_version;
uint8_t micro_version; uint8_t micro_version;
uint16_t count; uint16_t count;
time_t next_retry; time_t next_retry;
memcached_st *root; memcached_st *root;
uint64_t limit_maxbytes; uint64_t limit_maxbytes;
uint32_t server_failure_counter; uint32_t server_failure_counter;
skipping to change at line 60 skipping to change at line 60
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);
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);
/* These should not currently be used by end users */ /* These should not currently be used by end users */
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);
memcached_server_st *memcached_server_create_with(memcached_st *memc, memca
ched_server_st *host,
const char *hostname, uns
igned int port,
uint32_t weight, memcache
d_connection type);
void memcached_server_free(memcached_server_st *ptr); void memcached_server_free(memcached_server_st *ptr);
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);
memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat
_st *stat,
memcached_return *error);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* __MEMCACHED_SERVER_H__ */ #endif /* __MEMCACHED_SERVER_H__ */
 End of changes. 4 change blocks. 
2 lines changed or deleted 13 lines changed or added


 memcached_string.h   memcached_string.h 
skipping to change at line 18 skipping to change at line 18
#ifndef __MEMCACHED_STRING_H__ #ifndef __MEMCACHED_STRING_H__
#define __MEMCACHED_STRING_H__ #define __MEMCACHED_STRING_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
struct memcached_string_st { struct memcached_string_st {
memcached_st *root; memcached_st *root;
memcached_allocated is_allocated; bool is_allocated;
char *end; char *end;
size_t current_size; size_t current_size;
size_t block_size; size_t block_size;
char *string; char *string;
}; };
#define memcached_string_length(A) (size_t)((A)->end - (A)->string) #define memcached_string_length(A) (size_t)((A)->end - (A)->string)
#define memcached_string_set_length(A, B) (A)->end= (A)->string + B #define memcached_string_set_length(A, B) (A)->end= (A)->string + B
#define memcached_string_size(A) (A)->current_size #define memcached_string_size(A) (A)->current_size
#define memcached_string_value(A) (A)->string #define memcached_string_value(A) (A)->string
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 memcached_types.h   memcached_types.h 
skipping to change at line 18 skipping to change at line 18
#ifndef __MEMCACHED_TYPES_H__ #ifndef __MEMCACHED_TYPES_H__
#define __MEMCACHED_TYPES_H__ #define __MEMCACHED_TYPES_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
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_analysis_st memcached_analysis_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 struct memcached_continuum_item_st memcached_continuum_item_st; typedef struct memcached_continuum_item_st memcached_continuum_item_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);
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 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/