projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merged up with build.
[m6w6/libmemcached]
/
libmemcached
/
server.c
diff --git
a/libmemcached/server.c
b/libmemcached/server.c
index d0ce3f74fea809da2442dfc36f226477cea3dbcf..f3bc6998370346f3bbd13000b953c518345eaf30 100644
(file)
--- a/
libmemcached/server.c
+++ b/
libmemcached/server.c
@@
-115,7
+115,7
@@
memcached_return_t memcached_server_cursor(memcached_st *ptr,
{
uint32_t y;
{
uint32_t y;
- for (y= 0; y <
ptr->number_of_hosts
; y++)
+ for (y= 0; y <
memcached_server_count(ptr)
; y++)
{
uint32_t x;
{
uint32_t x;
@@
-142,7
+142,7
@@
memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key
unlikely (*error != MEMCACHED_SUCCESS)
return NULL;
unlikely (*error != MEMCACHED_SUCCESS)
return NULL;
- unlikely (
ptr->number_of_hosts
== 0)
+ unlikely (
memcached_server_count(ptr)
== 0)
{
*error= MEMCACHED_NO_SERVERS;
return NULL;
{
*error= MEMCACHED_NO_SERVERS;
return NULL;
@@
-162,10
+162,9
@@
memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key
const char *memcached_server_error(memcached_server_st *ptr)
{
const char *memcached_server_error(memcached_server_st *ptr)
{
- if (ptr)
- return ptr->cached_server_error;
- else
- return NULL;
+ return ptr
+ ? ptr->cached_server_error
+ : NULL;
}
void memcached_server_error_reset(memcached_server_st *ptr)
}
void memcached_server_error_reset(memcached_server_st *ptr)
@@
-177,3
+176,15
@@
memcached_server_st *memcached_server_get_last_disconnect(memcached_st *ptr)
{
return ptr->last_disconnected_server;
}
{
return ptr->last_disconnected_server;
}
+
+uint32_t memcached_server_list_count(memcached_server_st *ptr)
+{
+ return (ptr == NULL)
+ ? 0
+ : memcached_servers_count(ptr);
+}
+
+void memcached_server_list_free(memcached_server_st *ptr)
+{
+ server_list_free(NULL, ptr);
+}