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 dist fix from Monty
[m6w6/libmemcached]
/
libmemcached
/
server_list.c
diff --git
a/libmemcached/server_list.c
b/libmemcached/server_list.c
index 10b6a6b37cc8e9517ecdb0a1464c2a70fa355cdc..c20f8dbf9b775679131a5db0c4473d44d5682462 100644
(file)
--- a/
libmemcached/server_list.c
+++ b/
libmemcached/server_list.c
@@
-37,6
+37,7
@@
memcached_server_list_append_with_weight(memcached_server_list_st ptr,
new_host_list= (memcached_server_write_instance_st)realloc(ptr, sizeof(memcached_server_st) * count);
if (!new_host_list)
{
new_host_list= (memcached_server_write_instance_st)realloc(ptr, sizeof(memcached_server_st) * count);
if (!new_host_list)
{
+ ptr->cached_errno= errno;
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return NULL;
}
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return NULL;
}
@@
-59,19
+60,19
@@
memcached_server_list_append(memcached_server_list_st ptr,
return memcached_server_list_append_with_weight(ptr, hostname, port, 0, error);
}
return memcached_server_list_append_with_weight(ptr, hostname, port, 0, error);
}
-
inline
uint32_t memcached_server_list_count(const memcached_server_list_st self)
+uint32_t memcached_server_list_count(const memcached_server_list_st self)
{
return (self == NULL)
? 0
: self->number_of_hosts;
}
{
return (self == NULL)
? 0
: self->number_of_hosts;
}
-
inline
memcached_server_st *memcached_server_list(const memcached_st *self)
+memcached_server_st *memcached_server_list(const memcached_st *self)
{
return self->servers;
}
{
return self->servers;
}
-
inline
void memcached_server_list_set(memcached_st *self, memcached_server_st *list)
+void memcached_server_list_set(memcached_st *self, memcached_server_st *list)
{
self->servers= list;
}
{
self->servers= list;
}