m4: -fmudflip is long since gone

[awesomized/libmemcached] / libmemcached / virtual_bucket.c

diff --git a/libmemcached/virtual_bucket.c b/libmemcached/virtual_bucket.c
index 26dd90c4bcff99f99020126a8be71723bdbf591a..951881bd390e42640fbda13bed64f2c230933451 100644 (file)
--- a/libmemcached/virtual_bucket.c
+++ b/libmemcached/virtual_bucket.c
@@ -36,7 +36,6 @@
  */
 
 #include <libmemcached/common.h>
-#include <libmemcached/virtual_bucket.h>
 
 struct bucket_t {
   uint32_t master;
@@ -56,21 +55,27 @@ memcached_return_t memcached_virtual_bucket_create(memcached_st *self,
                                                    const uint32_t buckets,
                                                    const uint32_t replicas)
 {
-  if (! self || ! host_map || ! buckets)
+  if (self == NULL || host_map == NULL || buckets == 0U)
+  {
     return MEMCACHED_INVALID_ARGUMENTS;
+  }
 
   memcached_virtual_bucket_free(self);
 
   struct memcached_virtual_bucket_t *virtual_bucket= (struct memcached_virtual_bucket_t *)malloc(sizeof(struct memcached_virtual_bucket_t) + sizeof(struct bucket_t) *buckets);
   
-  if (! virtual_bucket)
+  if (virtual_bucket == NULL)
+  {
     return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+  }
+
 
   virtual_bucket->size= buckets;
   virtual_bucket->replicas= replicas;
   self->virtual_bucket= virtual_bucket;
 
-  for (uint32_t x=0; x < buckets; x++)
+  uint32_t x= 0;
+  for (; x < buckets; x++)
   {
     virtual_bucket->buckets[x].master= host_map[x];
     if (forward_map)
@@ -82,36 +87,34 @@ memcached_return_t memcached_virtual_bucket_create(memcached_st *self,
       virtual_bucket->buckets[x].forward= 0;
     }
   }
-  
 
   return MEMCACHED_SUCCESS;
 }
 
 void memcached_virtual_bucket_free(memcached_st *self)
 {
-  if (! self)
-    return;
-
-  if (! self->virtual_bucket)
-    return;
-
-  free(self->virtual_bucket);
-  self->virtual_bucket= NULL;
+  if (self)
+  {
+    if (self->virtual_bucket)
+    {
+      free(self->virtual_bucket);
+      self->virtual_bucket= NULL;
+    }
+  }
 }
 
 uint32_t memcached_virtual_bucket_get(const memcached_st *self, uint32_t digest)
 {
-  if (! self)
-    return 0;
-
-  if (! self->virtual_bucket)
-    return 0;
-
-  if (self->virtual_bucket)
+  if (self)
   {
-    uint32_t result= (uint32_t) (digest & (self->virtual_bucket->size -1));
-    return self->virtual_bucket->buckets[result].master;
+    if (self->virtual_bucket)
+    {
+      uint32_t result= (uint32_t) (digest & (self->virtual_bucket->size -1));
+      return self->virtual_bucket->buckets[result].master;
+    }
+
+    return (uint32_t) (digest & (self->number_of_hosts -1));
   }
 
-  return (uint32_t) (digest & (self->number_of_hosts -1));
+  return 0;
 }