projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge Trond
[awesomized/libmemcached]
/
libmemcached
/
memcached_result.c
diff --git
a/libmemcached/memcached_result.c
b/libmemcached/memcached_result.c
index 8d376f680fd45ced6ef1cd6a88b4f3f21ed19666..1462b89c3ef42e446162e44842931800bfbfcba7 100644
(file)
--- a/
libmemcached/memcached_result.c
+++ b/
libmemcached/memcached_result.c
@@
-14,14
+14,10
@@
memcached_result_st *memcached_result_create(memcached_st *memc,
memset(ptr, 0, sizeof(memcached_result_st));
else
{
memset(ptr, 0, sizeof(memcached_result_st));
else
{
- if (memc->call_malloc)
- ptr= (memcached_result_st *)memc->call_malloc(memc, sizeof(memcached_result_st));
- else
- ptr= (memcached_result_st *)malloc(sizeof(memcached_result_st));
+ ptr= memc->call_malloc(memc, sizeof(memcached_result_st));
if (ptr == NULL)
return NULL;
if (ptr == NULL)
return NULL;
- memset(ptr, 0, sizeof(memcached_result_st));
ptr->is_allocated= true;
}
ptr->is_allocated= true;
}