make clang-format using clang-format-3.6

1 files changed, 35 insertions, 63 deletions

diff --git a/src/AppleMessageDigestImpl.cc b/src/AppleMessageDigestImpl.cc
index 59e4c4dd..4204cc5f 100644
--- a/src/AppleMessageDigestImpl.cc
+++ b/src/AppleMessageDigestImpl.cc
@@ -42,77 +42,50 @@
 namespace aria2 {
 namespace {
 
-template<size_t dlen,
-         typename ctx_t,
-         int (*init_fn)(ctx_t*),
-         int (*update_fn)(ctx_t*, const void*, CC_LONG),
-         int(*final_fn)(unsigned char*, ctx_t*)>
+template <size_t dlen, typename ctx_t, int (*init_fn)(ctx_t*),
+          int (*update_fn)(ctx_t*, const void*, CC_LONG),
+          int (*final_fn)(unsigned char*, ctx_t*)>
 class MessageDigestBase : public MessageDigestImpl {
 public:
   MessageDigestBase() { reset(); }
   virtual ~MessageDigestBase() {}
 
-  static  size_t length() {
-    return dlen;
-  }
-  virtual size_t getDigestLength() const CXX11_OVERRIDE {
-    return dlen;
-  }
-  virtual void reset() CXX11_OVERRIDE {
-    init_fn(&ctx_);
-  }
-  virtual void update(const void* data, size_t length) CXX11_OVERRIDE {
+  static size_t length() { return dlen; }
+  virtual size_t getDigestLength() const CXX11_OVERRIDE { return dlen; }
+  virtual void reset() CXX11_OVERRIDE { init_fn(&ctx_); }
+  virtual void update(const void* data, size_t length) CXX11_OVERRIDE
+  {
     auto bytes = reinterpret_cast<const char*>(data);
     while (length) {
-      CC_LONG l = std::min(length, (size_t)std::numeric_limits<uint32_t>::max());
+      CC_LONG l =
+          std::min(length, (size_t)std::numeric_limits<uint32_t>::max());
       update_fn(&ctx_, bytes, l);
       length -= l;
       bytes += l;
     }
   }
-  virtual void digest(unsigned char* md) CXX11_OVERRIDE {
-    final_fn(md, &ctx_);
-  }
+  virtual void digest(unsigned char* md) CXX11_OVERRIDE { final_fn(md, &ctx_); }
+
 private:
   ctx_t ctx_;
 };
 
-typedef MessageDigestBase<CC_MD5_DIGEST_LENGTH,
-                          CC_MD5_CTX,
-                          CC_MD5_Init,
-                          CC_MD5_Update,
-                          CC_MD5_Final>
-MessageDigestMD5;
-typedef MessageDigestBase<CC_SHA1_DIGEST_LENGTH,
-                          CC_SHA1_CTX,
-                          CC_SHA1_Init,
-                          CC_SHA1_Update,
-                          CC_SHA1_Final>
-MessageDigestSHA1;
-typedef MessageDigestBase<CC_SHA224_DIGEST_LENGTH,
-                          CC_SHA256_CTX,
-                          CC_SHA224_Init,
-                          CC_SHA224_Update,
-                          CC_SHA224_Final>
-MessageDigestSHA224;
-typedef MessageDigestBase<CC_SHA256_DIGEST_LENGTH,
-                          CC_SHA256_CTX,
-                          CC_SHA256_Init,
-                          CC_SHA256_Update,
-                          CC_SHA256_Final>
-MessageDigestSHA256;
-typedef MessageDigestBase<CC_SHA384_DIGEST_LENGTH,
-                          CC_SHA512_CTX,
-                          CC_SHA384_Init,
-                          CC_SHA384_Update,
-                          CC_SHA384_Final>
-MessageDigestSHA384;
-typedef MessageDigestBase<CC_SHA512_DIGEST_LENGTH,
-                          CC_SHA512_CTX,
-                          CC_SHA512_Init,
-                          CC_SHA512_Update,
-                          CC_SHA512_Final>
-MessageDigestSHA512;
+typedef MessageDigestBase<CC_MD5_DIGEST_LENGTH, CC_MD5_CTX, CC_MD5_Init,
+                          CC_MD5_Update, CC_MD5_Final> MessageDigestMD5;
+typedef MessageDigestBase<CC_SHA1_DIGEST_LENGTH, CC_SHA1_CTX, CC_SHA1_Init,
+                          CC_SHA1_Update, CC_SHA1_Final> MessageDigestSHA1;
+typedef MessageDigestBase<CC_SHA224_DIGEST_LENGTH, CC_SHA256_CTX,
+                          CC_SHA224_Init, CC_SHA224_Update,
+                          CC_SHA224_Final> MessageDigestSHA224;
+typedef MessageDigestBase<CC_SHA256_DIGEST_LENGTH, CC_SHA256_CTX,
+                          CC_SHA256_Init, CC_SHA256_Update,
+                          CC_SHA256_Final> MessageDigestSHA256;
+typedef MessageDigestBase<CC_SHA384_DIGEST_LENGTH, CC_SHA512_CTX,
+                          CC_SHA384_Init, CC_SHA384_Update,
+                          CC_SHA384_Final> MessageDigestSHA384;
+typedef MessageDigestBase<CC_SHA512_DIGEST_LENGTH, CC_SHA512_CTX,
+                          CC_SHA512_Init, CC_SHA512_Update,
+                          CC_SHA512_Final> MessageDigestSHA512;
 
 } // namespace
 
@@ -122,13 +95,12 @@ std::unique_ptr<MessageDigestImpl> MessageDigestImpl::sha1()
 }
 
 MessageDigestImpl::hashes_t MessageDigestImpl::hashes = {
-  { "sha-1", make_hi<MessageDigestSHA1>() },
-  { "sha-224", make_hi<MessageDigestSHA224>() },
-  { "sha-256", make_hi<MessageDigestSHA256>() },
-  { "sha-384", make_hi<MessageDigestSHA384>() },
-  { "sha-512", make_hi<MessageDigestSHA512>() },
-  { "md5", make_hi<MessageDigestMD5>() },
-  ADLER32_MESSAGE_DIGEST
-};
+    {"sha-1", make_hi<MessageDigestSHA1>()},
+    {"sha-224", make_hi<MessageDigestSHA224>()},
+    {"sha-256", make_hi<MessageDigestSHA256>()},
+    {"sha-384", make_hi<MessageDigestSHA384>()},
+    {"sha-512", make_hi<MessageDigestSHA512>()},
+    {"md5", make_hi<MessageDigestMD5>()},
+    ADLER32_MESSAGE_DIGEST};
 
 } // namespace aria2