X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.cc;h=f08f8bf077cdcc150ee98721dbcf3054e0beeac3;hb=fbdda95bad712d301373b64193eb3ca00f281e55;hp=7011fd240c68843a93667af8dbfa2d3d6135550c;hpb=f34725871a4ad46ea3b3194d829eebf81cc5c08e;p=awesomized%2Flibmemcached

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index 7011fd24..f08f8bf0 100644
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -50,7 +50,7 @@ static inline void _server_init(memcached_server_st *self, memcached_st *root,
   self->number_of_hosts= 0;
   self->cursor_active= 0;
   self->port= port;
-  self->fd= -1;
+  self->fd= INVALID_SOCKET;
   self->io_bytes_sent= 0;
   self->server_failure_counter= 0;
   self->server_failure_counter_query_id= 0;
@@ -88,11 +88,11 @@ static inline void _server_init(memcached_server_st *self, memcached_st *root,
 
 static memcached_server_st *_server_create(memcached_server_st *self, const memcached_st *memc)
 {
-  if (not self)
+  if (self == NULL)
   {
    self= libmemcached_xmalloc(memc, struct memcached_server_st);
 
-    if (not self)
+    if (self == NULL)
     {
       return NULL; /*  MEMCACHED_MEMORY_ALLOCATION_FAILURE */
     }
@@ -131,9 +131,8 @@ memcached_server_st *__server_create_with(memcached_st *memc,
 
   _server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
 
-
   if (memc and memcached_is_udp(memc))
-  {
+  { 
     self->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH;
     memcached_io_init_udp_header(self, 0);
   }