projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Code change to use struct bitsets.
[m6w6/libmemcached]
/
libmemcached
/
memcached_server.c
diff --git
a/libmemcached/memcached_server.c
b/libmemcached/memcached_server.c
index 2ecbe214d9fb416f60b9fca98290bb70ee37977f..ca0f4d04a6535ccf1ed47948226f6c6d669ea65e 100644
(file)
--- a/
libmemcached/memcached_server.c
+++ b/
libmemcached/memcached_server.c
@@
-12,10
+12,12
@@
memcached_server_st *memcached_server_create(memcached_st *memc, memcached_serve
if (!ptr)
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
if (!ptr)
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
- ptr->is_allocated= true;
+ ptr->
options.
is_allocated= true;
}
else
}
else
+ {
memset(ptr, 0, sizeof(memcached_server_st));
memset(ptr, 0, sizeof(memcached_server_st));
+ }
ptr->root= memc;
ptr->root= memc;
@@
-59,10
+61,15
@@
void memcached_server_free(memcached_server_st *ptr)
if (ptr->address_info)
freeaddrinfo(ptr->address_info);
if (ptr->address_info)
freeaddrinfo(ptr->address_info);
- if (ptr->is_allocated)
+
+ if (memcached_is_allocated(ptr))
+ {
ptr->root->call_free(ptr->root, ptr);
ptr->root->call_free(ptr->root, ptr);
+ }
else
else
+ {
memset(ptr, 0, sizeof(memcached_server_st));
memset(ptr, 0, sizeof(memcached_server_st));
+ }
}
/*
}
/*