make clang-format using clang-format-3.6

1 files changed, 44 insertions, 52 deletions

diff --git a/src/SocketBuffer.cc b/src/SocketBuffer.cc
index a9e27c5d..9b3c6f22 100644
--- a/src/SocketBuffer.cc
+++ b/src/SocketBuffer.cc
@@ -46,21 +46,20 @@
 
 namespace aria2 {
 
-SocketBuffer::ByteArrayBufEntry::ByteArrayBufEntry
-(unsigned char* bytes, size_t length,
- std::unique_ptr<ProgressUpdate> progressUpdate)
-  : BufEntry(std::move(progressUpdate)), bytes_(bytes), length_(length)
-{}
-
-SocketBuffer::ByteArrayBufEntry::~ByteArrayBufEntry()
+SocketBuffer::ByteArrayBufEntry::ByteArrayBufEntry(
+    unsigned char* bytes, size_t length,
+    std::unique_ptr<ProgressUpdate> progressUpdate)
+    : BufEntry(std::move(progressUpdate)), bytes_(bytes), length_(length)
 {
-  delete [] bytes_;
 }
 
-ssize_t SocketBuffer::ByteArrayBufEntry::send
-(const std::shared_ptr<SocketCore>& socket, size_t offset)
+SocketBuffer::ByteArrayBufEntry::~ByteArrayBufEntry() { delete[] bytes_; }
+
+ssize_t
+SocketBuffer::ByteArrayBufEntry::send(const std::shared_ptr<SocketCore>& socket,
+                                      size_t offset)
 {
-  return socket->writeData(bytes_+offset, length_-offset);
+  return socket->writeData(bytes_ + offset, length_ - offset);
 }
 
 bool SocketBuffer::ByteArrayBufEntry::final(size_t offset) const
@@ -68,25 +67,24 @@ bool SocketBuffer::ByteArrayBufEntry::final(size_t offset) const
   return length_ <= offset;
 }
 
-size_t SocketBuffer::ByteArrayBufEntry::getLength() const
-{
-  return length_;
-}
+size_t SocketBuffer::ByteArrayBufEntry::getLength() const { return length_; }
 
 const unsigned char* SocketBuffer::ByteArrayBufEntry::getData() const
 {
   return bytes_;
 }
 
-SocketBuffer::StringBufEntry::StringBufEntry
-(std::string s, std::unique_ptr<ProgressUpdate> progressUpdate)
-  : BufEntry(std::move(progressUpdate)), str_(std::move(s))
-{}
+SocketBuffer::StringBufEntry::StringBufEntry(
+    std::string s, std::unique_ptr<ProgressUpdate> progressUpdate)
+    : BufEntry(std::move(progressUpdate)), str_(std::move(s))
+{
+}
 
-ssize_t SocketBuffer::StringBufEntry::send
-(const std::shared_ptr<SocketCore>& socket, size_t offset)
+ssize_t
+SocketBuffer::StringBufEntry::send(const std::shared_ptr<SocketCore>& socket,
+                                   size_t offset)
 {
-  return socket->writeData(str_.data()+offset, str_.size()-offset);
+  return socket->writeData(str_.data() + offset, str_.size() - offset);
 }
 
 bool SocketBuffer::StringBufEntry::final(size_t offset) const
@@ -94,10 +92,7 @@ bool SocketBuffer::StringBufEntry::final(size_t offset) const
   return str_.size() <= offset;
 }
 
-size_t SocketBuffer::StringBufEntry::getLength() const
-{
-  return str_.size();
-}
+size_t SocketBuffer::StringBufEntry::getLength() const { return str_.size(); }
 
 const unsigned char* SocketBuffer::StringBufEntry::getData() const
 {
@@ -105,26 +100,27 @@ const unsigned char* SocketBuffer::StringBufEntry::getData() const
 }
 
 SocketBuffer::SocketBuffer(std::shared_ptr<SocketCore> socket)
-  : socket_(std::move(socket)), offset_(0)
-{}
+    : socket_(std::move(socket)), offset_(0)
+{
+}
 
 SocketBuffer::~SocketBuffer() {}
 
 void SocketBuffer::pushBytes(unsigned char* bytes, size_t len,
                              std::unique_ptr<ProgressUpdate> progressUpdate)
 {
-  if(len > 0) {
-    bufq_.push_back(make_unique<ByteArrayBufEntry>
-                    (bytes, len, std::move(progressUpdate)));
+  if (len > 0) {
+    bufq_.push_back(
+        make_unique<ByteArrayBufEntry>(bytes, len, std::move(progressUpdate)));
   }
 }
 
 void SocketBuffer::pushStr(std::string data,
                            std::unique_ptr<ProgressUpdate> progressUpdate)
 {
-  if(!data.empty()) {
-    bufq_.push_back(make_unique<StringBufEntry>
-                    (std::move(data), std::move(progressUpdate)));
+  if (!data.empty()) {
+    bufq_.push_back(make_unique<StringBufEntry>(std::move(data),
+                                                std::move(progressUpdate)));
   }
 }
 
@@ -132,41 +128,40 @@ ssize_t SocketBuffer::send()
 {
   a2iovec iov[A2_IOV_MAX];
   size_t totalslen = 0;
-  while(!bufq_.empty()) {
+  while (!bufq_.empty()) {
     size_t num;
     size_t bufqlen = bufq_.size();
     ssize_t amount = 24_k;
     ssize_t firstlen = bufq_.front()->getLength() - offset_;
     amount -= firstlen;
-    iov[0].A2IOVEC_BASE =
-      reinterpret_cast<char*>(const_cast<unsigned char*>
-                              (bufq_.front()->getData() + offset_));
+    iov[0].A2IOVEC_BASE = reinterpret_cast<char*>(
+        const_cast<unsigned char*>(bufq_.front()->getData() + offset_));
     iov[0].A2IOVEC_LEN = firstlen;
     num = 1;
-    for(auto i = std::begin(bufq_)+1, eoi = std::end(bufq_);
-        i != eoi && num < A2_IOV_MAX && num < bufqlen && amount > 0;
-        ++i, ++num) {
+    for (auto i = std::begin(bufq_) + 1, eoi = std::end(bufq_);
+         i != eoi && num < A2_IOV_MAX && num < bufqlen && amount > 0;
+         ++i, ++num) {
 
       ssize_t len = (*i)->getLength();
 
-      if(amount < len) {
+      if (amount < len) {
         break;
       }
 
       amount -= len;
       iov[num].A2IOVEC_BASE =
-        reinterpret_cast<char*>(const_cast<unsigned char*>((*i)->getData()));
+          reinterpret_cast<char*>(const_cast<unsigned char*>((*i)->getData()));
       iov[num].A2IOVEC_LEN = len;
     }
     ssize_t slen = socket_->writeVector(iov, num);
-    if(slen == 0 && !socket_->wantRead() && !socket_->wantWrite()) {
+    if (slen == 0 && !socket_->wantRead() && !socket_->wantWrite()) {
       throw DL_ABORT_EX(fmt(EX_SOCKET_SEND, "Connection closed."));
     }
     // A2_LOG_NOTICE(fmt("num=%zu, amount=%d, bufq.size()=%zu, SEND=%d",
     //                   num, amount, bufq_.size(), slen));
     totalslen += slen;
 
-    if(firstlen > slen) {
+    if (firstlen > slen) {
       offset_ += slen;
       bufq_.front()->progressUpdate(slen, false);
       if (socket_->wantRead() || socket_->wantWrite()) {
@@ -180,10 +175,10 @@ ssize_t SocketBuffer::send()
     bufq_.pop_front();
     offset_ = 0;
 
-    for(size_t i = 1; i < num; ++i) {
+    for (size_t i = 1; i < num; ++i) {
       auto& buf = bufq_.front();
       ssize_t len = buf->getLength();
-      if(len > slen) {
+      if (len > slen) {
         offset_ = slen;
         bufq_.front()->progressUpdate(slen, false);
         goto fin;
@@ -194,13 +189,10 @@ ssize_t SocketBuffer::send()
       bufq_.pop_front();
     }
   }
- fin:
+fin:
   return totalslen;
 }
 
-bool SocketBuffer::sendBufferIsEmpty() const
-{
-  return bufq_.empty();
-}
+bool SocketBuffer::sendBufferIsEmpty() const { return bufq_.empty(); }
 
 } // namespace aria2