projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixes issue where if illegal options caused parsing to fail an incorrect
[awesomized/libmemcached]
/
libmemcached
/
memcached.h
diff --git
a/libmemcached/memcached.h
b/libmemcached/memcached.h
index 9d0d2f0be30a814e949a7833f230dd60e3364a3c..193eb33c723f8300c5102e962b7f0f31ada1b73a 100644
(file)
--- a/
libmemcached/memcached.h
+++ b/
libmemcached/memcached.h
@@
-85,7
+85,7
@@
struct memcached_st {
bool use_udp:1;
bool verify_key:1;
bool tcp_keepalive:1;
bool use_udp:1;
bool verify_key:1;
bool tcp_keepalive:1;
- bool
load_from_fil
e:1;
+ bool
ping_servic
e:1;
} flags;
memcached_server_distribution_t distribution;
hashkit_st hashkit;
} flags;
memcached_server_distribution_t distribution;
hashkit_st hashkit;
@@
-130,6
+130,9
@@
struct memcached_st {
struct memcached_sasl_st sasl;
struct memcached_error_st *error_messages;
struct memcached_array_st *prefix_key;
struct memcached_sasl_st sasl;
struct memcached_error_st *error_messages;
struct memcached_array_st *prefix_key;
+ struct {
+ struct memcached_array_st *filename;
+ } configure;
struct {
bool is_allocated:1;
} options;
struct {
bool is_allocated:1;
} options;
@@
-146,11
+149,14
@@
void memcached_servers_reset(memcached_st *ptr);
LIBMEMCACHED_API
memcached_st *memcached_create(memcached_st *ptr);
LIBMEMCACHED_API
memcached_st *memcached_create(memcached_st *ptr);
+LIBMEMCACHED_API
+memcached_st *memcached_create_with_options(const char *string, size_t length);
+
LIBMEMCACHED_API
void memcached_free(memcached_st *ptr);
LIBMEMCACHED_API
LIBMEMCACHED_API
void memcached_free(memcached_st *ptr);
LIBMEMCACHED_API
-
void
memcached_reset(memcached_st *ptr);
+
memcached_return_t
memcached_reset(memcached_st *ptr);
LIBMEMCACHED_API
void memcached_reset_last_disconnected_server(memcached_st *ptr);
LIBMEMCACHED_API
void memcached_reset_last_disconnected_server(memcached_st *ptr);