libmemcached: headers diff between 0.11 and 0.12 versions

	memcached.h	memcached.h

	skipping to change at line 35	skipping to change at line 35
	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;

	#define MEMCACHED_VERSION_STRING 12	#define MEMCACHED_VERSION_STRING 12
	#define MEMCACHED_DEFAULT_PORT 11211	#define MEMCACHED_DEFAULT_PORT 11211
	#define MEMCACHED_DEFAULT_COMMAND_SIZE 350	#define MEMCACHED_DEFAULT_COMMAND_SIZE 350
	#define SMALL_STRING_LEN 1024	#define SMALL_STRING_LEN 1024
	#define HUGE_STRING_LEN 8196	#define HUGE_STRING_LEN 8196
	#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 HUGE_STRING_LEN	#define MEMCACHED_MAX_BUFFER HUGE_STRING_LEN

		#define MEMCACHED_MAX_HOST_LENGTH 64
		#define MEMCACHED_WHEEL_SIZE 1024
		#define MEMCACHED_STRIDE 4
		#define MEMCACHED_DEFAULT_TIMEOUT INT32_MAX

	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 66	skipping to change at line 70
	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,

		MEMCACHED_FETCH_NOTFINISHED,
		MEMCACHED_TIMEOUT,
	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_CONSISTENT,
		} memcached_server_distribution;

		typedef enum {
	MEMCACHED_BEHAVIOR_NO_BLOCK,	MEMCACHED_BEHAVIOR_NO_BLOCK,
	MEMCACHED_BEHAVIOR_TCP_NODELAY,	MEMCACHED_BEHAVIOR_TCP_NODELAY,
	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;	} memcached_behavior;

	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,

	skipping to change at line 107	skipping to change at line 119
	MEMCACHED_CONNECTION_UNIX_SOCKET,	MEMCACHED_CONNECTION_UNIX_SOCKET,
	} memcached_connection;	} memcached_connection;

	typedef enum {	typedef enum {
	MEMCACHED_NOT_ALLOCATED,	MEMCACHED_NOT_ALLOCATED,
	MEMCACHED_ALLOCATED,	MEMCACHED_ALLOCATED,
	MEMCACHED_USED,	MEMCACHED_USED,
	} memcached_allocated;	} memcached_allocated;

	struct memcached_server_st {	struct memcached_server_st {

	char *hostname;	char hostname[MEMCACHED_MAX_HOST_LENGTH];
	unsigned int port;	unsigned int port;
	int fd;	int fd;
	unsigned int stack_responses;	unsigned int stack_responses;
	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 *write_ptr;	char *write_ptr;
	char read_buffer[MEMCACHED_MAX_BUFFER];	char read_buffer[MEMCACHED_MAX_BUFFER];

		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;	memcached_allocated sockaddr_inited;

	struct sockaddr_in servAddr;	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;
	};	};

	struct memcached_stat_st {	struct memcached_stat_st {
	uint32_t pid;	uint32_t pid;
	uint32_t uptime;	uint32_t uptime;

	skipping to change at line 186	skipping to change at line 199
	unsigned int number_of_hosts;	unsigned int number_of_hosts;
	unsigned int cursor_server;	unsigned int cursor_server;
	char connected;	char connected;
	int cached_errno;	int cached_errno;
	unsigned long long flags;	unsigned long long flags;
	int send_size;	int send_size;
	int recv_size;	int recv_size;
	int32_t poll_timeout;	int32_t poll_timeout;
	memcached_string_st result_buffer;	memcached_string_st result_buffer;
	memcached_hash hash;	memcached_hash hash;

		memcached_server_distribution distribution;
		unsigned int wheel[MEMCACHED_WHEEL_SIZE];
		uint8_t replicas;
	memcached_return warning; /* Future Use */	memcached_return warning; /* Future Use */
	};	};

	/* Public API */	/* Public API */
	memcached_st memcached_create(memcached_st ptr);	memcached_st memcached_create(memcached_st ptr);
	void memcached_free(memcached_st *ptr);	void memcached_free(memcached_st *ptr);
	memcached_st memcached_clone(memcached_st clone, memcached_st *ptr);	memcached_st memcached_clone(memcached_st clone, 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);

	skipping to change at line 288	skipping to change at line 304
	char *hostname, unsigned int p ort,	char *hostname, unsigned int p ort,
	memcached_return *error);	memcached_return *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(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);	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);


		char memcached_get_by_key(memcached_st ptr,
		char *master_key, size_t master_key_length,
		char *key, size_t key_length,
		size_t *value_length,
		uint16_t *flags,
		memcached_return *error);

		memcached_return memcached_mget_by_key(memcached_st *ptr,
		char *master_key, size_t master_key_
		length,
		char *keys, size_t key_length,
		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,
		uint16_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,
		uint16_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,
		uint16_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,
		uint16_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,
		uint16_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,
		uint16_t flags,
		uint64_t cas);
		memcached_return memcached_delete_by_key(memcached_st *ptr,
		char *master_key, size_t master_ke
		y_length,
		char *key, size_t key_length,
		time_t expiration);

	/* Result Struct */	/* Result Struct */
	void memcached_result_free(memcached_result_st *result);	void memcached_result_free(memcached_result_st *result);
	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

	skipping to change at line 311	skipping to change at line 386
	#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

	#ifndef __WATCHPOINT_H__	#ifndef __WATCHPOINT_H__
	#define __WATCHPOINT_H__	#define __WATCHPOINT_H__
	/* Some personal debugging functions */	/* Some personal debugging functions */
	#ifdef HAVE_DEBUG	#ifdef HAVE_DEBUG
	#define WATCHPOINT fprintf(stderr, "\nWATCHPOINT %s:%d (%s)\n", __FILE__, _ _LINE__,__func__);fflush(stdout);	#define WATCHPOINT fprintf(stderr, "\nWATCHPOINT %s:%d (%s)\n", __FILE__, _ _LINE__,__func__);fflush(stdout);
	#ifdef __MEMCACHED_H__	#ifdef __MEMCACHED_H__
	#define WATCHPOINT_ERROR(A) fprintf(stderr, "\nWATCHPOINT %s:%d %s\n", __FI LE__, __LINE__, memcached_strerror(NULL, A));fflush(stdout);	#define WATCHPOINT_ERROR(A) fprintf(stderr, "\nWATCHPOINT %s:%d %s\n", __FI LE__, __LINE__, memcached_strerror(NULL, A));fflush(stdout);

		#define WATCHPOINT_IFERROR(A) if(A != MEMCACHED_SUCCESS)fprintf(stderr, "\n WATCHPOINT %s:%d %s\n", __FILE__, __LINE__, memcached_strerror(NULL, A));ff lush(stdout);
	#endif	#endif
	#define WATCHPOINT_STRING(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s\n" , __FILE__, __LINE__,__func__,A);fflush(stdout);	#define WATCHPOINT_STRING(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s\n" , __FILE__, __LINE__,__func__,A);fflush(stdout);

		#define WATCHPOINT_STRING_LENGTH(A,B) fprintf(stderr, "\nWATCHPOINT %s:%d ( %s) %.*s\n", __FILE__, __LINE__,__func__,(int)B,A);fflush(stdout);
	#define WATCHPOINT_NUMBER(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %zu\n ", __FILE__, __LINE__,__func__,(size_t)(A));fflush(stdout);	#define WATCHPOINT_NUMBER(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %zu\n ", __FILE__, __LINE__,__func__,(size_t)(A));fflush(stdout);
	#define WATCHPOINT_ERRNO(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__, strerror(A));A= 0;fflush(stdout);	#define WATCHPOINT_ERRNO(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__, strerror(A));A= 0;fflush(stdout);
	#define WATCHPOINT_ASSERT(A) assert((A));	#define WATCHPOINT_ASSERT(A) assert((A));
	#else	#else

	/*
	#define WATCHPOINT { 1; };
	#define WATCHPOINT_ERROR(A) { 1; };
	#define WATCHPOINT_STRING(A) { 1; };
	#define WATCHPOINT_NUMBER(A) { 1; };
	#define WATCHPOINT_ERRNO(A) { 1; };
	#define WATCHPOINT_ASSERT(A) { 1; };
	*/
	#define WATCHPOINT	#define WATCHPOINT
	#ifdef __MEMCACHED_H__	#ifdef __MEMCACHED_H__
	#define WATCHPOINT_ERROR(A)	#define WATCHPOINT_ERROR(A)

		#define WATCHPOINT_IFERROR(A)
	#endif	#endif
	#define WATCHPOINT_STRING(A)	#define WATCHPOINT_STRING(A)
	#define WATCHPOINT_NUMBER(A)	#define WATCHPOINT_NUMBER(A)
	#define WATCHPOINT_ERRNO(A)	#define WATCHPOINT_ERRNO(A)
	#define WATCHPOINT_ASSERT(A)	#define WATCHPOINT_ASSERT(A)
	#endif	#endif

	#endif /* __WATCHPOINT_H__ */	#endif /* __WATCHPOINT_H__ */

	#ifdef __cplusplus	#ifdef __cplusplus

End of changes. 13 change blocks.
	10 lines changed or deleted	88 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/