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 local trunk
[awesomized/libmemcached]
/
libmemcached
/
memcached.cc
diff --git
a/libmemcached/memcached.cc
b/libmemcached/memcached.cc
index a1551cd2632566eb50f7825069855ca292ffd6d7..21306f2a94f784e3b1fae0e4ad834f53209b1b88 100644
(file)
--- a/
libmemcached/memcached.cc
+++ b/
libmemcached/memcached.cc
@@
-157,8
+157,7
@@
static void _free(memcached_st *ptr, bool release_st)
if (ptr->on_cleanup)
ptr->on_cleanup(ptr);
if (ptr->on_cleanup)
ptr->on_cleanup(ptr);
- if (ptr->ketama.continuum)
- libmemcached_free(ptr, ptr->ketama.continuum);
+ libmemcached_free(ptr, ptr->ketama.continuum);
memcached_array_free(ptr->prefix_key);
ptr->prefix_key= NULL;
memcached_array_free(ptr->prefix_key);
ptr->prefix_key= NULL;
@@
-190,7
+189,7
@@
memcached_st *memcached_create(memcached_st *ptr)
{
ptr= (memcached_st *)malloc(sizeof(memcached_st));
{
ptr= (memcached_st *)malloc(sizeof(memcached_st));
- if (
!
ptr)
+ if (
not
ptr)
{
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
}
{
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
}
@@
-226,12
+225,6
@@
memcached_st *memcached_create(memcached_st *ptr)
memcached_st *memcached(const char *string, size_t length)
{
memcached_st *memcached(const char *string, size_t length)
{
- if ((not length and string) or (length and not string))
- {
- errno= EINVAL;
- return NULL;
- }
-
memcached_st *self= memcached_create(NULL);
if (not self)
{
memcached_st *self= memcached_create(NULL);
if (not self)
{
@@
-242,23
+235,20
@@
memcached_st *memcached(const char *string, size_t length)
if (not length)
return self;
if (not length)
return self;
- memcached_return_t rc;
- rc= memcached_parse_configuration(self, string, length);
+ memcached_return_t rc= memcached_parse_configuration(self, string, length);
- if (
rc == MEMCACHED_SUCCESS &&
memcached_parse_filename(self))
+ if (
memcached_success(rc) and
memcached_parse_filename(self))
{
rc= memcached_parse_configure_file(self, memcached_parse_filename(self), memcached_parse_filename_length(self));
}
{
rc= memcached_parse_configure_file(self, memcached_parse_filename(self), memcached_parse_filename_length(self));
}
- if (
rc != MEMCACHED_SUCCESS
)
+ if (
memcached_failed(rc)
)
{
memcached_free(self);
errno= EINVAL;
return NULL;
}
{
memcached_free(self);
errno= EINVAL;
return NULL;
}
- errno= 0;
-
return self;
}
return self;
}
@@
-285,7
+275,7
@@
memcached_return_t memcached_reset(memcached_st *ptr)
void memcached_servers_reset(memcached_st *ptr)
{
void memcached_servers_reset(memcached_st *ptr)
{
- if (
!
ptr)
+ if (
not
ptr)
return;
memcached_server_list_free(memcached_server_list(ptr));
return;
memcached_server_list_free(memcached_server_list(ptr));
@@
-302,7
+292,7
@@
void memcached_servers_reset(memcached_st *ptr)
void memcached_reset_last_disconnected_server(memcached_st *ptr)
{
void memcached_reset_last_disconnected_server(memcached_st *ptr)
{
- if (
!
ptr)
+ if (
not
ptr)
return;
if (ptr->last_disconnected_server)
return;
if (ptr->last_disconnected_server)
@@
-314,7
+304,7
@@
void memcached_reset_last_disconnected_server(memcached_st *ptr)
void memcached_free(memcached_st *ptr)
{
void memcached_free(memcached_st *ptr)
{
- if (
!
ptr)
+ if (
not
ptr)
return;
_free(ptr, true);
return;
_free(ptr, true);
@@
-388,6
+378,7
@@
memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
new_clone->prefix_key= memcached_array_clone(new_clone, source->prefix_key);
new_clone->prefix_key= memcached_array_clone(new_clone, source->prefix_key);
+ new_clone->configure.filename= memcached_array_clone(new_clone, source->prefix_key);
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
if (source->sasl.callbacks)
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
if (source->sasl.callbacks)