Merge in exp/alias patches

[awesomized/libmemcached] / libmemcached / virtual_bucket.c

diff --git a/libmemcached/virtual_bucket.c b/libmemcached/virtual_bucket.c
index 1428fba8ed9cd4efcda41c12e1e1c85f9fe10012..f91bf4549f089ec887312d186cb54ab9f0d96a7a 100644 (file)
--- a/libmemcached/virtual_bucket.c
+++ b/libmemcached/virtual_bucket.c
@@ -36,8 +36,7 @@
  */
 
 #include <config.h>
-#include <libmemcached/memcached.h>
-#include <libmemcached/virtual_bucket.h>
+#include <libmemcached/common.h>
 
 struct bucket_t {
   uint32_t master;
@@ -58,7 +57,9 @@ memcached_return_t memcached_virtual_bucket_create(memcached_st *self,
                                                    const uint32_t replicas)
 {
   if (! self || ! host_map || ! buckets)
+  {
     return MEMCACHED_INVALID_ARGUMENTS;
+  }
 
   memcached_virtual_bucket_free(self);
 
@@ -71,7 +72,8 @@ memcached_return_t memcached_virtual_bucket_create(memcached_st *self,
   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)