projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge trunk
[m6w6/libmemcached]
/
libmemcached
/
server.cc
diff --git
a/libmemcached/server.cc
b/libmemcached/server.cc
index 669979ef1cd154cec31587ccececd6bf94b34634..c9c5ffca6b3a9269ca3782d3f1e68fe3f4151375 100644
(file)
--- a/
libmemcached/server.cc
+++ b/
libmemcached/server.cc
@@
-124,7
+124,7
@@
memcached_server_st *__server_create_with(memcached_st *memc,
self= _server_create(self, memc);
self= _server_create(self, memc);
- if (
not self
)
+ if (
self == NULL
)
{
return NULL;
}
{
return NULL;
}
@@
-166,8
+166,10
@@
void __server_free(memcached_server_st *self)
void memcached_server_free(memcached_server_st *self)
{
void memcached_server_free(memcached_server_st *self)
{
- if (not self)
+ if (self == NULL)
+ {
return;
return;
+ }
if (memcached_server_list_count(self))
{
if (memcached_server_list_count(self))
{
@@
-185,7
+187,7
@@
memcached_server_st *memcached_server_clone(memcached_server_st *destination,
memcached_server_st *source)
{
/* We just do a normal create if source is missing */
memcached_server_st *source)
{
/* We just do a normal create if source is missing */
- if (
not source
)
+ if (
source == NULL
)
{
return NULL;
}
{
return NULL;
}
@@
-258,17
+260,19
@@
memcached_return_t memcached_server_execute(memcached_st *ptr,
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
-memcached_server_instance_st memcached_server_by_key(
const
memcached_st *ptr,
+memcached_server_instance_st memcached_server_by_key(memcached_st *ptr,
const char *key,
size_t key_length,
memcached_return_t *error)
{
const char *key,
size_t key_length,
memcached_return_t *error)
{
- memcached_return_t rc;
memcached_return_t unused;
memcached_return_t unused;
-
if (not error)
if (not error)
+ {
error= &unused;
error= &unused;
+ }
+
+ memcached_return_t rc;
if (memcached_failed(rc= initialize_const_query(ptr)))
{
*error= rc;
if (memcached_failed(rc= initialize_const_query(ptr)))
{
*error= rc;