projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updates for 0.29 release
[awesomized/libmemcached]
/
libmemcached
/
memcached_server.c
diff --git
a/libmemcached/memcached_server.c
b/libmemcached/memcached_server.c
index fe132fe1ab0c29663c89edd23deb6d1b7703578d..4aebfd3b7367506dfb030cb64794226fd56d2b29 100644
(file)
--- a/
libmemcached/memcached_server.c
+++ b/
libmemcached/memcached_server.c
@@
-13,13
+13,10
@@
memcached_server_st *memcached_server_create(memcached_st *memc, memcached_serve
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
memset(ptr, 0, sizeof(memcached_server_st));
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
memset(ptr, 0, sizeof(memcached_server_st));
- ptr->is_allocated=
MEMCACHED_ALLOCATED
;
+ ptr->is_allocated=
true
;
}
else
}
else
- {
- ptr->is_allocated= MEMCACHED_USED;
memset(ptr, 0, sizeof(memcached_server_st));
memset(ptr, 0, sizeof(memcached_server_st));
- }
ptr->root= memc;
ptr->root= memc;
@@
-44,7
+41,11
@@
memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_
host->read_ptr= host->read_buffer;
if (memc)
host->next_retry= memc->retry_timeout;
host->read_ptr= host->read_buffer;
if (memc)
host->next_retry= memc->retry_timeout;
- host->sockaddr_inited= MEMCACHED_NOT_ALLOCATED;
+ if (type == MEMCACHED_CONNECTION_UDP)
+ {
+ host->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH;
+ memcached_io_init_udp_header(host, 0);
+ }
return host;
}
return host;
}
@@
-59,13
+60,15
@@
void memcached_server_free(memcached_server_st *ptr)
ptr->address_info= NULL;
}
ptr->address_info= NULL;
}
- if (ptr->is_allocated
== MEMCACHED_ALLOCATED
)
+ if (ptr->is_allocated)
{
if (ptr->root && ptr->root->call_free)
ptr->root->call_free(ptr->root, ptr);
else
free(ptr);
}
{
if (ptr->root && ptr->root->call_free)
ptr->root->call_free(ptr->root, ptr);
else
free(ptr);
}
+ else
+ memset(ptr, 0, sizeof(memcached_server_st));
}
/*
}
/*
@@
-73,31
+76,14
@@
void memcached_server_free(memcached_server_st *ptr)
*/
memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr)
{
*/
memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr)
{
- memcached_server_st *new_clone;
-
/* We just do a normal create if ptr is missing */
if (ptr == NULL)
return NULL;
/* We just do a normal create if ptr is missing */
if (ptr == NULL)
return NULL;
- if (clone && clone->is_allocated == MEMCACHED_USED)
- {
- WATCHPOINT_ASSERT(0);
- return NULL;
- }
-
- new_clone= memcached_server_create(ptr->root, clone);
-
- if (new_clone == NULL)
- return NULL;
-
- new_clone->root= ptr->root;
-
/* TODO We should check return type */
/* TODO We should check return type */
- memcached_server_create_with(new_clone->root, new_clone,
- ptr->hostname, ptr->port, ptr->weight,
- ptr->type);
-
- return new_clone;
+ return memcached_server_create_with(ptr->root, clone,
+ ptr->hostname, ptr->port, ptr->weight,
+ ptr->type);
}
memcached_return memcached_server_cursor(memcached_st *ptr,
}
memcached_return memcached_server_cursor(memcached_st *ptr,
@@
-129,11
+115,10
@@
memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key
{
uint32_t server_key;
{
uint32_t server_key;
- unlikely (key_length == 0)
- {
- *error= MEMCACHED_NO_KEY_PROVIDED;
+ *error= memcached_validate_key_length(key_length,
+ ptr->flags & MEM_BINARY_PROTOCOL);
+ unlikely (*error != MEMCACHED_SUCCESS)
return NULL;
return NULL;
- }
unlikely (ptr->number_of_hosts == 0)
{
unlikely (ptr->number_of_hosts == 0)
{
@@
-141,7
+126,7
@@
memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key
return NULL;
}
return NULL;
}
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcach
e
d_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
{
*error= MEMCACHED_BAD_KEY_PROVIDED;
return NULL;
{
*error= MEMCACHED_BAD_KEY_PROVIDED;
return NULL;