projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Protected stdbool.h from being included by C++, which is invalid on Sun Studio.
[m6w6/libmemcached]
/
libmemcached
/
server.c
diff --git
a/libmemcached/server.c
b/libmemcached/server.c
index 814962c76675f8d47ed8b34d301c2262a5411b66..f3bc6998370346f3bbd13000b953c518345eaf30 100644
(file)
--- a/
libmemcached/server.c
+++ b/
libmemcached/server.c
@@
-1,5
+1,5
@@
/* LibMemcached
/* LibMemcached
- * Copyright (C) 2006-2009 Brian Aker
+ * Copyright (C) 2006-2009 Brian Aker
* All rights reserved.
*
* Use and distribution licensed under the BSD license. See
* All rights reserved.
*
* Use and distribution licensed under the BSD license. See
@@
-94,9
+94,9
@@
memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcache
if (ptr == NULL)
return NULL;
if (ptr == NULL)
return NULL;
- rv
= memcached_server_create_with(ptr->root, clone,
-
ptr->hostname, ptr->port, ptr->weight,
-
ptr->type);
+ rv= memcached_server_create_with(ptr->root, clone,
+ ptr->hostname, ptr->port, ptr->weight,
+ ptr->type);
if (rv != NULL)
{
rv->cached_errno= ptr->cached_errno;
if (rv != NULL)
{
rv->cached_errno= ptr->cached_errno;
@@
-113,11
+113,11
@@
memcached_return_t memcached_server_cursor(memcached_st *ptr,
void *context,
uint32_t number_of_callbacks)
{
void *context,
uint32_t number_of_callbacks)
{
- u
nsigned in
t y;
+ u
int32_
t y;
- for (y= 0; y <
ptr->number_of_hosts
; y++)
+ for (y= 0; y <
memcached_server_count(ptr)
; y++)
{
{
- u
nsigned in
t x;
+ u
int32_
t x;
for (x= 0; x < number_of_callbacks; x++)
{
for (x= 0; x < number_of_callbacks; 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);
+}