projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in pid/ping status.
[awesomized/libmemcached]
/
libmemcached
/
util
/
ping.cc
diff --git
a/libmemcached/util/ping.cc
b/libmemcached/util/ping.cc
index 52489b95fdef180a4fd97076bb2d04cb19a96be7..839810d4d7478c530cad35811918a022abe42333 100644
(file)
--- a/
libmemcached/util/ping.cc
+++ b/
libmemcached/util/ping.cc
@@
-43,7
+43,16
@@
bool libmemcached_util_ping(const char *hostname, in_port_t port, memcached_return_t *ret)
{
bool libmemcached_util_ping(const char *hostname, in_port_t port, memcached_return_t *ret)
{
+ memcached_return_t unused;
+ if (not ret)
+ ret= &unused;
+
memcached_st *memc_ptr= memcached_create(NULL);
memcached_st *memc_ptr= memcached_create(NULL);
+ if (not memc_ptr)
+ {
+ *ret= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+ return false;
+ }
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,10
+72,7
@@
bool libmemcached_util_ping(const char *hostname, in_port_t port, memcached_retu
}
memcached_free(memc_ptr);
}
memcached_free(memc_ptr);
- if (ret)
- {
- *ret= rc;
- }
+ *ret= rc;
return memcached_success(rc);
}
return memcached_success(rc);
}