make clang-format using clang-format-3.6

1 files changed, 40 insertions, 36 deletions

diff --git a/src/DHTRoutingTable.cc b/src/DHTRoutingTable.cc
index 8cb82051..536b676b 100644
--- a/src/DHTRoutingTable.cc
+++ b/src/DHTRoutingTable.cc
@@ -50,16 +50,16 @@
 namespace aria2 {
 
 DHTRoutingTable::DHTRoutingTable(const std::shared_ptr<DHTNode>& localNode)
-  : localNode_(localNode),
-    root_(make_unique<DHTBucketTreeNode>
-          (std::make_shared<DHTBucket>(localNode_))),
-    numBucket_(1),
-    taskQueue_{nullptr},
-    taskFactory_{nullptr}
-{}
+    : localNode_(localNode),
+      root_(make_unique<DHTBucketTreeNode>(
+          std::make_shared<DHTBucket>(localNode_))),
+      numBucket_(1),
+      taskQueue_{nullptr},
+      taskFactory_{nullptr}
+{
+}
 
-DHTRoutingTable::~DHTRoutingTable()
-{}
+DHTRoutingTable::~DHTRoutingTable() {}
 
 bool DHTRoutingTable::addNode(const std::shared_ptr<DHTNode>& node)
 {
@@ -74,29 +74,32 @@ bool DHTRoutingTable::addGoodNode(const std::shared_ptr<DHTNode>& node)
 bool DHTRoutingTable::addNode(const std::shared_ptr<DHTNode>& node, bool good)
 {
   A2_LOG_DEBUG(fmt("Trying to add node:%s", node->toString().c_str()));
-  if(*localNode_ == *node) {
+  if (*localNode_ == *node) {
     A2_LOG_DEBUG("Adding node with the same ID with localnode is not allowed.");
     return false;
   }
   auto treeNode = dht::findTreeNodeFor(root_.get(), node->getID());
-  while(1) {
+  while (1) {
     const std::shared_ptr<DHTBucket>& bucket = treeNode->getBucket();
-    if(bucket->addNode(node)) {
+    if (bucket->addNode(node)) {
       A2_LOG_DEBUG("Added DHTNode.");
       return true;
-    } else if(bucket->splitAllowed()) {
+    }
+    else if (bucket->splitAllowed()) {
       A2_LOG_DEBUG(fmt("Splitting bucket. Range:%s-%s",
                        util::toHex(bucket->getMinID(), DHT_ID_LENGTH).c_str(),
                        util::toHex(bucket->getMaxID(), DHT_ID_LENGTH).c_str()));
       treeNode->split();
       ++numBucket_;
-      if(treeNode->getLeft()->isInRange(node->getID())) {
+      if (treeNode->getLeft()->isInRange(node->getID())) {
         treeNode = treeNode->getLeft();
-      } else {
+      }
+      else {
         treeNode = treeNode->getRight();
       }
-    } else {
-      if(good) {
+    }
+    else {
+      if (good) {
         bucket->cacheNode(node);
         A2_LOG_DEBUG(fmt("Cached node=%s", node->toString().c_str()));
       }
@@ -106,38 +109,39 @@ bool DHTRoutingTable::addNode(const std::shared_ptr<DHTNode>& node, bool good)
   return false;
 }
 
-void DHTRoutingTable::getClosestKNodes
-(std::vector<std::shared_ptr<DHTNode> >& nodes,
- const unsigned char* key) const
+void DHTRoutingTable::getClosestKNodes(
+    std::vector<std::shared_ptr<DHTNode>>& nodes,
+    const unsigned char* key) const
 {
   dht::findClosestKNodes(nodes, root_.get(), key);
 }
 
-int DHTRoutingTable::getNumBucket() const
-{
-  return numBucket_;
-}
+int DHTRoutingTable::getNumBucket() const { return numBucket_; }
 
 void DHTRoutingTable::showBuckets() const
-{/*
-   for(std::deque<std::shared_ptr<DHTBucket> >::const_iterator itr = buckets_.begin(); itr != buckets_.end(); ++itr) {
-   cerr << "prefix = " << (*itr)->getPrefixLength() << ", "
-   << "nodes = " << (*itr)->countNode() << endl;
-   }
- */
-}
+{ /*
+    for(std::deque<std::shared_ptr<DHTBucket> >::const_iterator itr =
+    buckets_.begin(); itr != buckets_.end(); ++itr) {
+    cerr << "prefix = " << (*itr)->getPrefixLength() << ", "
+    << "nodes = " << (*itr)->countNode() << endl;
+    }
+  */}
 
-std::shared_ptr<DHTBucket> DHTRoutingTable::getBucketFor(const unsigned char* nodeID) const
+std::shared_ptr<DHTBucket>
+DHTRoutingTable::getBucketFor(const unsigned char* nodeID) const
 {
   return dht::findBucketFor(root_.get(), nodeID);
 }
 
-std::shared_ptr<DHTBucket> DHTRoutingTable::getBucketFor(const std::shared_ptr<DHTNode>& node) const
+std::shared_ptr<DHTBucket>
+DHTRoutingTable::getBucketFor(const std::shared_ptr<DHTNode>& node) const
 {
   return getBucketFor(node->getID());
 }
 
-std::shared_ptr<DHTNode> DHTRoutingTable::getNode(const unsigned char* nodeID, const std::string& ipaddr, uint16_t port) const
+std::shared_ptr<DHTNode> DHTRoutingTable::getNode(const unsigned char* nodeID,
+                                                  const std::string& ipaddr,
+                                                  uint16_t port) const
 {
   std::shared_ptr<DHTBucket> bucket = getBucketFor(nodeID);
   return bucket->getNode(nodeID, ipaddr, port);
@@ -158,8 +162,8 @@ void DHTRoutingTable::moveBucketTail(const std::shared_ptr<DHTNode>& node)
   getBucketFor(node)->moveToTail(node);
 }
 
-void DHTRoutingTable::getBuckets
-(std::vector<std::shared_ptr<DHTBucket> >& buckets) const
+void DHTRoutingTable::getBuckets(
+    std::vector<std::shared_ptr<DHTBucket>>& buckets) const
 {
   dht::enumerateBucket(buckets, root_.get());
 }