projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Compiler fixes.
[awesomized/libmemcached]
/
libmemcachedutil
/
pid.cc
diff --git
a/libmemcachedutil/pid.cc
b/libmemcachedutil/pid.cc
index 7ff665b646fc4a6bb594719070c6eb9160f4c8e1..5194838369b048f899d792747cb15ad23b19e6fe 100644
(file)
--- a/
libmemcachedutil/pid.cc
+++ b/
libmemcachedutil/pid.cc
@@
-48,11
+48,13
@@
pid_t libmemcached_util_getpid(const char *hostname, in_port_t port, memcached_r
pid_t pid= -1;
memcached_return_t unused;
pid_t pid= -1;
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 -1;
{
*ret= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return -1;
@@
-72,11
+74,10
@@
pid_t libmemcached_util_getpid(const char *hostname, in_port_t port, memcached_r
}
else if (rc == MEMCACHED_SOME_ERRORS) // Generic answer, we will now find the specific reason (if one exists)
{
}
else if (rc == MEMCACHED_SOME_ERRORS) // Generic answer, we will now find the specific reason (if one exists)
{
- 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);
}
@@
-144,7
+145,7
@@
pid_t libmemcached_util_getpid2(const char *hostname, in_port_t port, const char
#if 0
assert_msg(instance and instance->error_messages, " ");
#endif
#if 0
assert_msg(instance and instance->error_messages, " ");
#endif
- if (instance and
instance->error_messages
)
+ if (instance and
memcached_server_error(instance)
)
{
rc= memcached_server_error_return(instance);
}
{
rc= memcached_server_error_return(instance);
}