projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updated release notes
[awesomized/libmemcached]
/
libmemcached
/
memcached.c
diff --git
a/libmemcached/memcached.c
b/libmemcached/memcached.c
index a15cd2f2824adf60bf00d091f8998e9973b849f9..a93bef7d651512ac7d49c4cf92e260fb200fb866 100644
(file)
--- a/
libmemcached/memcached.c
+++ b/
libmemcached/memcached.c
@@
-9,12
+9,11
@@
memcached_st *memcached_create(memcached_st *ptr)
if (ptr == NULL)
{
if (ptr == NULL)
{
- ptr= (memcached_st *)
malloc(
sizeof(memcached_st));
+ ptr= (memcached_st *)
calloc(1,
sizeof(memcached_st));
if (!ptr)
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
if (!ptr)
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
- memset(ptr, 0, sizeof(memcached_st));
ptr->is_allocated= true;
}
else
ptr->is_allocated= true;
}
else
@@
-81,9
+80,9
@@
memcached_st *memcached_clone(memcached_st *clone, memcached_st *source)
{
return NULL;
}
{
return NULL;
}
-
+
new_clone= memcached_create(clone);
new_clone= memcached_create(clone);
-
+
if (new_clone == NULL)
return NULL;
if (new_clone == NULL)
return NULL;
@@
-108,6
+107,10
@@
memcached_st *memcached_clone(memcached_st *clone, memcached_st *source)
new_clone->call_realloc= source->call_realloc;
new_clone->get_key_failure= source->get_key_failure;
new_clone->delete_trigger= source->delete_trigger;
new_clone->call_realloc= source->call_realloc;
new_clone->get_key_failure= source->get_key_failure;
new_clone->delete_trigger= source->delete_trigger;
+ new_clone->server_failure_limit= source->server_failure_limit;
+ new_clone->io_msg_watermark= source->io_msg_watermark;
+ new_clone->io_bytes_watermark= source->io_bytes_watermark;
+ new_clone->io_key_prefetch= source->io_key_prefetch;
if (source->hosts)
rc= memcached_server_push(new_clone, source->hosts);
if (source->hosts)
rc= memcached_server_push(new_clone, source->hosts);