projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Adding in versioning documentation.
[awesomized/libmemcached]
/
libmemcached
/
server.cc
diff --git
a/libmemcached/server.cc
b/libmemcached/server.cc
index b91512832a59568602ce34c321eff5534da4ad32..cf63f4ca4c7e34033cdb04c2d767e869c2d74047 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;
}
@@
-132,7
+132,7
@@
memcached_server_st *__server_create_with(memcached_st *memc,
_server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
_server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
- if (
type == MEMCACHED_CONNECTION_UDP
)
+ if (
memc and memcached_is_udp(memc)
)
{
self->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH;
memcached_io_init_udp_header(self, 0);
{
self->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH;
memcached_io_init_udp_header(self, 0);
@@
-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;
}
@@
-263,12
+265,14
@@
memcached_server_instance_st memcached_server_by_key(memcached_st *ptr,
size_t key_length,
memcached_return_t *error)
{
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;