projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in trunk.
[m6w6/libmemcached]
/
libmemcached
/
stats.cc
diff --git
a/libmemcached/stats.cc
b/libmemcached/stats.cc
index 3c269be142ef7fa6f59f3621f65d73a3ec1c93bb..eb2904438e746223ff399d5dbde01dcfce6e7555 100644
(file)
--- a/
libmemcached/stats.cc
+++ b/
libmemcached/stats.cc
@@
-552,15
+552,10
@@
void memcached_stat_free(const memcached_st *ptr, memcached_stat_st *memc_stat)
if (memc_stat->root)
{
libmemcached_free(memc_stat->root, memc_stat);
if (memc_stat->root)
{
libmemcached_free(memc_stat->root, memc_stat);
+ return;
}
}
- else if (ptr)
- {
- libmemcached_free(ptr, memc_stat);
- }
- else
- {
- free(memc_stat);
- }
+
+ libmemcached_free(ptr, memc_stat);
}
static memcached_return_t call_stat_fn(memcached_st *ptr,
}
static memcached_return_t call_stat_fn(memcached_st *ptr,