projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix compile issue.
[awesomized/libmemcached]
/
libmemcachedutil
/
ping.cc
diff --git
a/libmemcachedutil/ping.cc
b/libmemcachedutil/ping.cc
index 82d891a9e090bbb6705cbda7192090731fd38159..0154b530d5ba8295345974ab05cc3feb7800fbe2 100644
(file)
--- a/
libmemcachedutil/ping.cc
+++ b/
libmemcachedutil/ping.cc
@@
-42,16
+42,20
@@
bool libmemcached_util_ping(const char *hostname, in_port_t port, memcached_return_t *ret)
{
memcached_return_t unused;
bool libmemcached_util_ping(const char *hostname, in_port_t port, memcached_return_t *ret)
{
memcached_return_t unused;
- if (not ret)
+ if (ret == NULL)
+ {
ret= &unused;
ret= &unused;
+ }
memcached_st *memc_ptr= memcached_create(NULL);
memcached_st *memc_ptr= memcached_create(NULL);
- if (
not memc_ptr
)
+ if (
memc_ptr == NULL
)
{
*ret= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return false;
}
{
*ret= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return false;
}
+ (void)memcached_behavior_set(memc_ptr, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, 400000);
+
memcached_return_t rc= memcached_server_add(memc_ptr, hostname, port);
if (memcached_success(rc))
{
memcached_return_t rc= memcached_server_add(memc_ptr, hostname, port);
if (memcached_success(rc))
{
@@
-63,8
+67,8
@@
bool libmemcached_util_ping(const char *hostname, in_port_t port, memcached_retu
memcached_server_instance_st instance=
memcached_server_instance_by_position(memc_ptr, 0);
memcached_server_instance_st instance=
memcached_server_instance_by_position(memc_ptr, 0);
- assert_msg(instance and
instance->error_messages
, " ");
- if (instance and
instance->error_messages
)
+ assert_msg(instance and
memcached_server_error(instance)
, " ");
+ if (instance and
memcached_server_error(instance)
)
{
rc= memcached_server_error_return(instance);
}
{
rc= memcached_server_error_return(instance);
}
@@
-117,8
+121,8
@@
bool libmemcached_util_ping2(const char *hostname, in_port_t port, const char *u
memcached_server_instance_st instance=
memcached_server_instance_by_position(memc_ptr, 0);
memcached_server_instance_st instance=
memcached_server_instance_by_position(memc_ptr, 0);
- assert_msg(instance and
instance->error_messages
, " ");
- if (instance and
instance->error_messages
)
+ assert_msg(instance and
memcached_server_error(instance)
, " ");
+ if (instance and
memcached_server_error(instance)
)
{
rc= memcached_server_error_return(instance);
}
{
rc= memcached_server_error_return(instance);
}