projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in all of the new parser work.
[awesomized/libmemcached]
/
libmemcached
/
memcached.c
diff --git
a/libmemcached/memcached.c
b/libmemcached/memcached.c
index d5411e86c0ba3becb6934e9981cbec2e36a859cf..b0333569ec7fe8f45fe943a16d210b8d70eb502c 100644
(file)
--- a/
libmemcached/memcached.c
+++ b/
libmemcached/memcached.c
@@
-34,7
+34,9
@@
static const memcached_st global_copy= {
.use_sort_hosts= false,
.use_udp= false,
.verify_key= false,
.use_sort_hosts= false,
.use_udp= false,
.verify_key= false,
- .tcp_keepalive= false
+ .tcp_keepalive= false,
+ .load_from_file= false
+
}
};
}
};
@@
-92,7
+94,8
@@
static inline bool _memcached_init(memcached_st *self)
self->get_key_failure= NULL;
self->delete_trigger= NULL;
self->callbacks= NULL;
self->get_key_failure= NULL;
self->delete_trigger= NULL;
self->callbacks= NULL;
- self->sasl= NULL;
+ self->sasl.callbacks= NULL;
+ self->sasl.is_allocated= false;
return true;
}
return true;
}
@@
-176,7
+179,7
@@
void memcached_free(memcached_st *ptr)
if (ptr->continuum)
libmemcached_free(ptr, ptr->continuum);
if (ptr->continuum)
libmemcached_free(ptr, ptr->continuum);
- if (ptr->sasl)
+ if (ptr->sasl
.callbacks
)
{
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
memcached_destroy_sasl_auth_data(ptr);
{
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
memcached_destroy_sasl_auth_data(ptr);
@@
-273,7
+276,7
@@
memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
}
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
}
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
- if (source->sasl
&& source->sasl->
callbacks)
+ if (source->sasl
.
callbacks)
{
if (memcached_clone_sasl(new_clone, source) != MEMCACHED_SUCCESS)
{
{
if (memcached_clone_sasl(new_clone, source) != MEMCACHED_SUCCESS)
{