make clang-format using clang-format-3.6

1 files changed, 65 insertions, 63 deletions

diff --git a/src/DefaultExtensionMessageFactory.cc b/src/DefaultExtensionMessageFactory.cc
index 60f70462..8ce977f7 100644
--- a/src/DefaultExtensionMessageFactory.cc
+++ b/src/DefaultExtensionMessageFactory.cc
@@ -59,73 +59,75 @@ namespace aria2 {
 
 // i686-w64-mingw32-g++ 4.6 does not support constructor delegate
 DefaultExtensionMessageFactory::DefaultExtensionMessageFactory()
-  : peerStorage_{nullptr},
-    registry_{nullptr},
-    dctx_{nullptr},
-    messageFactory_{nullptr},
-    dispatcher_{nullptr},
-    tracker_{nullptr}
-{}
+    : peerStorage_{nullptr},
+      registry_{nullptr},
+      dctx_{nullptr},
+      messageFactory_{nullptr},
+      dispatcher_{nullptr},
+      tracker_{nullptr}
+{
+}
 
-DefaultExtensionMessageFactory::DefaultExtensionMessageFactory
-(const std::shared_ptr<Peer>& peer, ExtensionMessageRegistry* registry)
-  : peerStorage_{nullptr},
-    peer_{peer},
-    registry_{registry},
-    dctx_{nullptr},
-    messageFactory_{nullptr},
-    dispatcher_{nullptr},
-    tracker_{nullptr}
-{}
+DefaultExtensionMessageFactory::DefaultExtensionMessageFactory(
+    const std::shared_ptr<Peer>& peer, ExtensionMessageRegistry* registry)
+    : peerStorage_{nullptr},
+      peer_{peer},
+      registry_{registry},
+      dctx_{nullptr},
+      messageFactory_{nullptr},
+      dispatcher_{nullptr},
+      tracker_{nullptr}
+{
+}
 
 std::unique_ptr<ExtensionMessage>
-DefaultExtensionMessageFactory::createMessage
-(const unsigned char* data, size_t length)
+DefaultExtensionMessageFactory::createMessage(const unsigned char* data,
+                                              size_t length)
 {
   uint8_t extensionMessageID = *data;
-  if(extensionMessageID == 0) {
+  if (extensionMessageID == 0) {
     // handshake
     auto m = HandshakeExtensionMessage::create(data, length);
     m->setPeer(peer_);
     m->setDownloadContext(dctx_);
     return std::move(m);
-  } else {
+  }
+  else {
     const char* extensionName = registry_->getExtensionName(extensionMessageID);
-    if(!extensionName) {
-      throw DL_ABORT_EX
-        (fmt("No extension registered for extended message ID %u",
-             extensionMessageID));
+    if (!extensionName) {
+      throw DL_ABORT_EX(
+          fmt("No extension registered for extended message ID %u",
+              extensionMessageID));
     }
-    if(strcmp(extensionName, "ut_pex") == 0) {
+    if (strcmp(extensionName, "ut_pex") == 0) {
       // uTorrent compatible Peer-Exchange
       auto m = UTPexExtensionMessage::create(data, length);
       m->setPeerStorage(peerStorage_);
       return std::move(m);
-    } else if(strcmp(extensionName, "ut_metadata") == 0) {
-      if(length == 0) {
-        throw DL_ABORT_EX
-          (fmt(MSG_TOO_SMALL_PAYLOAD_SIZE,
-               "ut_metadata",
-               static_cast<unsigned long>(length)));
+    }
+    else if (strcmp(extensionName, "ut_metadata") == 0) {
+      if (length == 0) {
+        throw DL_ABORT_EX(fmt(MSG_TOO_SMALL_PAYLOAD_SIZE, "ut_metadata",
+                              static_cast<unsigned long>(length)));
       }
       size_t end;
-      auto decoded = bencode2::decode(data+1, length - 1, end);
+      auto decoded = bencode2::decode(data + 1, length - 1, end);
       const Dict* dict = downcast<Dict>(decoded);
-      if(!dict) {
+      if (!dict) {
         throw DL_ABORT_EX("Bad ut_metadata: dictionary not found");
       }
       const Integer* msgType = downcast<Integer>(dict->get("msg_type"));
-      if(!msgType) {
+      if (!msgType) {
         throw DL_ABORT_EX("Bad ut_metadata: msg_type not found");
       }
       const Integer* index = downcast<Integer>(dict->get("piece"));
-      if(!index || index->i() < 0) {
+      if (!index || index->i() < 0) {
         throw DL_ABORT_EX("Bad ut_metadata: piece not found");
       }
-      switch(msgType->i()) {
+      switch (msgType->i()) {
       case 0: {
-        auto m = make_unique<UTMetadataRequestExtensionMessage>
-          (extensionMessageID);
+        auto m =
+            make_unique<UTMetadataRequestExtensionMessage>(extensionMessageID);
         m->setIndex(index->i());
         m->setDownloadContext(dctx_);
         m->setPeer(peer_);
@@ -134,40 +136,40 @@ DefaultExtensionMessageFactory::createMessage
         return std::move(m);
       }
       case 1: {
-        if(end == length) {
+        if (end == length) {
           throw DL_ABORT_EX("Bad ut_metadata data: data not found");
         }
         const Integer* totalSize = downcast<Integer>(dict->get("total_size"));
-        if(!totalSize || totalSize->i() < 0) {
+        if (!totalSize || totalSize->i() < 0) {
           throw DL_ABORT_EX("Bad ut_metadata data: total_size not found");
         }
-        auto m = make_unique<UTMetadataDataExtensionMessage>
-          (extensionMessageID);
+        auto m =
+            make_unique<UTMetadataDataExtensionMessage>(extensionMessageID);
         m->setIndex(index->i());
         m->setTotalSize(totalSize->i());
-        m->setData(&data[1+end], &data[length]);
+        m->setData(&data[1 + end], &data[length]);
         m->setUTMetadataRequestTracker(tracker_);
-        m->setPieceStorage
-          (dctx_->getOwnerRequestGroup()->getPieceStorage().get());
+        m->setPieceStorage(
+            dctx_->getOwnerRequestGroup()->getPieceStorage().get());
         m->setDownloadContext(dctx_);
         return std::move(m);
       }
       case 2: {
-        auto m = make_unique<UTMetadataRejectExtensionMessage>
-          (extensionMessageID);
+        auto m =
+            make_unique<UTMetadataRejectExtensionMessage>(extensionMessageID);
         m->setIndex(index->i());
         // No need to inject tracker because peer will be disconnected.
         return std::move(m);
       }
       default:
-        throw DL_ABORT_EX
-          (fmt("Bad ut_metadata: unknown msg_type=%" PRId64, msgType->i()));
+        throw DL_ABORT_EX(
+            fmt("Bad ut_metadata: unknown msg_type=%" PRId64, msgType->i()));
       }
-    } else {
-      throw DL_ABORT_EX
-        (fmt("Unsupported extension message received."
-             " extensionMessageID=%u, extensionName=%s",
-             extensionMessageID, extensionName));
+    }
+    else {
+      throw DL_ABORT_EX(fmt("Unsupported extension message received."
+                            " extensionMessageID=%u, extensionName=%s",
+                            extensionMessageID, extensionName));
     }
   }
 }
@@ -182,8 +184,8 @@ void DefaultExtensionMessageFactory::setPeer(const std::shared_ptr<Peer>& peer)
   peer_ = peer;
 }
 
-void DefaultExtensionMessageFactory::setExtensionMessageRegistry
-(ExtensionMessageRegistry* registry)
+void DefaultExtensionMessageFactory::setExtensionMessageRegistry(
+    ExtensionMessageRegistry* registry)
 {
   registry_ = registry;
 }
@@ -193,20 +195,20 @@ void DefaultExtensionMessageFactory::setDownloadContext(DownloadContext* dctx)
   dctx_ = dctx;
 }
 
-void DefaultExtensionMessageFactory::setBtMessageFactory
-(BtMessageFactory* factory)
+void DefaultExtensionMessageFactory::setBtMessageFactory(
+    BtMessageFactory* factory)
 {
   messageFactory_ = factory;
 }
 
-void DefaultExtensionMessageFactory::setBtMessageDispatcher
-(BtMessageDispatcher* disp)
+void DefaultExtensionMessageFactory::setBtMessageDispatcher(
+    BtMessageDispatcher* disp)
 {
   dispatcher_ = disp;
 }
 
-void DefaultExtensionMessageFactory::setUTMetadataRequestTracker
-(UTMetadataRequestTracker* tracker)
+void DefaultExtensionMessageFactory::setUTMetadataRequestTracker(
+    UTMetadataRequestTracker* tracker)
 {
   tracker_ = tracker;
 }