projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
libmemcached: fix #53 with supplied patch
[awesomized/libmemcached]
/
libmemcached
/
server_list.cc
diff --git
a/libmemcached/server_list.cc
b/libmemcached/server_list.cc
index 537e9edd8dfb04e7817a22e369793b6072d8fc3d..b5d5b72ee5b7c84eca79858cf27d4eb3c7255388 100644
(file)
--- a/
libmemcached/server_list.cc
+++ b/
libmemcached/server_list.cc
@@
-45,11
+45,11
@@
memcached_server_list_append_with_weight(memcached_server_list_st ptr,
uint32_t weight,
memcached_return_t *error)
{
uint32_t weight,
memcached_return_t *error)
{
- uint32_t count;
-
memcached_return_t unused;
if (error == NULL)
memcached_return_t unused;
if (error == NULL)
+ {
error= &unused;
error= &unused;
+ }
if (hostname == NULL)
{
if (hostname == NULL)
{
@@
-60,14
+60,14
@@
memcached_server_list_append_with_weight(memcached_server_list_st ptr,
{
port = 0;
}
{
port = 0;
}
- else if (
not port
)
+ else if (
port == 0
)
{
port= MEMCACHED_DEFAULT_PORT;
}
/* Increment count for hosts */
{
port= MEMCACHED_DEFAULT_PORT;
}
/* Increment count for hosts */
- count= 1;
+
uint32_t
count= 1;
if (ptr != NULL)
{
count+= memcached_server_list_count(ptr);
if (ptr != NULL)
{
count+= memcached_server_list_count(ptr);
@@
-127,8
+127,9
@@
uint32_t memcached_instance_list_count(const memcached_st* self)
: self->number_of_hosts;
}
: self->number_of_hosts;
}
-void memcached_instance_set(memcached_st* memc,
org::libmemcached::Instance
* list, const uint32_t host_list_size)
+void memcached_instance_set(memcached_st* memc,
memcached_instance_st
* list, const uint32_t host_list_size)
{
{
+ assert(memc);
memc->servers= list;
memc->number_of_hosts= host_list_size;
}
memc->servers= list;
memc->number_of_hosts= host_list_size;
}
@@
-147,7
+148,7
@@
void memcached_server_list_free(memcached_server_list_st self)
}
}
}
}
-void memcached_instance_list_free(
org::libmemcached::Instance
* self, uint32_t instance_count)
+void memcached_instance_list_free(
memcached_instance_st
* self, uint32_t instance_count)
{
if (self)
{
{
if (self)
{