bin: consolidate memcat

[awesomized/libmemcached] / src / libmemcached / hosts.cc

diff --git a/src/libmemcached/hosts.cc b/src/libmemcached/hosts.cc
index 8afbdb259f5c84114299d643a69cb57742fe5abb..b478881ce7731ac7faa7413e2ba589768e69e2e7 100644 (file)
--- a/src/libmemcached/hosts.cc
+++ b/src/libmemcached/hosts.cc
@@ -51,15 +51,20 @@ memcached_return_t run_distribution(Memcached *ptr) {
   case MEMCACHED_DISTRIBUTION_CONSISTENT:
   case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA:
   case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY:
-  case MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED: return update_continuum(ptr);
+  case MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED:
+    return update_continuum(ptr);
 
   case MEMCACHED_DISTRIBUTION_VIRTUAL_BUCKET:
-  case MEMCACHED_DISTRIBUTION_MODULA: break;
+  case MEMCACHED_DISTRIBUTION_MODULA:
+    break;
 
-  case MEMCACHED_DISTRIBUTION_RANDOM: srandom((uint32_t) time(NULL)); break;
+  case MEMCACHED_DISTRIBUTION_RANDOM:
+    srandom((uint32_t) time(NULL));
+    break;
 
   case MEMCACHED_DISTRIBUTION_CONSISTENT_MAX:
-  default: assert_msg(0, "Invalid distribution type passed to run_distribution()");
+  default:
+    assert_msg(0, "Invalid distribution type passed to run_distribution()");
   }
 
   return MEMCACHED_SUCCESS;
@@ -340,7 +345,7 @@ memcached_return_t memcached_server_push(memcached_st *shell, const memcached_se
 
     ptr->state.is_parsing = true;
     for (uint32_t x = 0; x < count; ++x, ++original_host_size) {
-      WATCHPOINT_ASSERT(list[x].hostname[0] != 0);
+      WATCHPOINT_ASSERT(list[x].hostname[0]);
 
       // We have extended the array, and now we will find it, and use it.
       memcached_instance_st *instance = memcached_instance_fetch(ptr, original_host_size);
@@ -391,7 +396,7 @@ memcached_return_t memcached_instance_push(memcached_st *ptr,
   // We use original_host_size since size will now point to the first new
   // instance allocated.
   for (uint32_t x = 0; x < number_of_hosts; ++x, ++original_host_size) {
-    WATCHPOINT_ASSERT(list[x]._hostname[0] != 0);
+    WATCHPOINT_ASSERT(list[x]._hostname[0]);
 
     // We have extended the array, and now we will find it, and use it.
     memcached_instance_st *instance = memcached_instance_fetch(ptr, original_host_size);