pool.h   pool.h 
skipping to change at line 63 skipping to change at line 63
memcached_pool_st *memcached_pool(const char *option_string, size_t option_ string_length); memcached_pool_st *memcached_pool(const char *option_string, size_t option_ string_length);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_st* memcached_pool_destroy(memcached_pool_st* pool); memcached_st* memcached_pool_destroy(memcached_pool_st* pool);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_st* memcached_pool_pop(memcached_pool_st* pool, memcached_st* memcached_pool_pop(memcached_pool_st* pool,
bool block, bool block,
memcached_return_t* rc); memcached_return_t* rc);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_pool_push(memcached_pool_st* pool, memcached_return_t memcached_pool_push(memcached_pool_st* pool,
memcached_st* mmc); memcached_st* mmc);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_pool_release(memcached_pool_st* pool, memcac hed_st* mmc); memcached_return_t memcached_pool_release(memcached_pool_st* pool, memcac hed_st* mmc);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_st* memcached_pool_fetch(memcached_pool_st*, struct timespec* rel ative_time, memcached_return_t* rc); memcached_st* memcached_pool_fetch(memcached_pool_st*, struct timespec* rel ative_time, memcached_return_t* rc);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_pool_behavior_set(memcached_pool_st *ptr, memcached_return_t memcached_pool_behavior_set(memcached_pool_st *ptr,
memcached_behavior_t flag, memcached_behavior_t flag,
uint64_t data); uint64_t data);
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 string.h   string.h 
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
* *
* Libmemcached library * Libhashkit library
* *
* Copyright (C) 2011 Data Differential, http://datadifferential.com/ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
* Copyright (C) 2006-2009 Brian Aker All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
* met: * met:
* *
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* *
* * Redistributions in binary form must reproduce the above * * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer * copyright notice, this list of conditions and the following disclaimer
skipping to change at line 40 skipping to change at line 39
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
#pragma once #pragma once
/** #ifdef __cplusplus
Strings are always under our control so we make some assumptions struct hashkit_string_st;
about them. #endif
1) is_initialized is always valid. #ifdef __cplusplus
2) A string once intialized will always be, until free where we extern "C" {
unset this flag. #endif
3) A string always has a root.
*/ HASHKIT_API
void hashkit_string_free(hashkit_string_st *ptr);
struct memcached_string_st {
char *end; HASHKIT_API
char *string; size_t hashkit_string_length(const hashkit_string_st *self);
size_t current_size;
struct memcached_st *root; HASHKIT_API
struct { const char *hashkit_string_c_str(const hashkit_string_st* self);
bool is_allocated:1;
bool is_initialized:1; #ifdef __cplusplus
} options; } // extern "C"
}; #endif
 End of changes. 3 change blocks. 
3 lines changed or deleted 2 lines changed or added


 types.h   types.h 
skipping to change at line 90 skipping to change at line 90
HASHKIT_DISTRIBUTION_RANDOM, HASHKIT_DISTRIBUTION_RANDOM,
HASHKIT_DISTRIBUTION_KETAMA, HASHKIT_DISTRIBUTION_KETAMA,
HASHKIT_DISTRIBUTION_MAX /* Always add new values before this. */ HASHKIT_DISTRIBUTION_MAX /* Always add new values before this. */
} hashkit_distribution_t; } hashkit_distribution_t;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
typedef struct hashkit_st hashkit_st; typedef struct hashkit_st hashkit_st;
typedef struct hashkit_string_st hashkit_string_st;
typedef uint32_t (*hashkit_hash_fn)(const char *key, size_t key_length, voi d *context); typedef uint32_t (*hashkit_hash_fn)(const char *key, size_t key_length, voi d *context);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 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/