Jelajahi Sumber

InternalMessageDigestImpl: Code cleanup

Tatsuhiro Tsujikawa 12 tahun lalu
induk
melakukan
7dc5567cad
2 mengubah file dengan 14 tambahan dan 9 penghapusan
  1. 13 8
      src/InternalMessageDigestImpl.cc
  2. 1 1
      src/MessageDigestImpl.h

+ 13 - 8
src/InternalMessageDigestImpl.cc

@@ -50,21 +50,25 @@ template<size_t dlen,
 class MessageDigestBase : public MessageDigestImpl {
 public:
   MessageDigestBase() { reset(); }
-  virtual ~MessageDigestBase() {
+  virtual ~MessageDigestBase()
+  {
     free_fn(&ctx_);
   }
 
-  static  size_t length() {
+  static  size_t length()
+  {
     return dlen;
   }
-  virtual size_t getDigestLength() const CXX11_OVERRIDE {
+  virtual size_t getDigestLength() const CXX11_OVERRIDE
+  {
     return dlen;
   }
-  virtual void reset() CXX11_OVERRIDE {
-    printf("hash-%d\n", dlen);
+  virtual void reset() CXX11_OVERRIDE
+  {
     init_fn(&ctx_);
   }
-  virtual void update(const void* data, size_t length) CXX11_OVERRIDE {
+  virtual void update(const void* data, size_t length) CXX11_OVERRIDE
+  {
     auto bytes = reinterpret_cast<const char*>(data);
     while (length) {
       size_t l = std::min(length, (size_t)std::numeric_limits<uint32_t>::max());
@@ -73,7 +77,8 @@ public:
       bytes += l;
     }
   }
-  virtual void digest(unsigned char* md) CXX11_OVERRIDE {
+  virtual void digest(unsigned char* md) CXX11_OVERRIDE
+  {
     final_fn(ctx_, md);
   }
 private:
@@ -99,7 +104,7 @@ MessageDigestSHA1;
 
 std::unique_ptr<MessageDigestImpl> MessageDigestImpl::sha1()
 {
-  return std::unique_ptr<MessageDigestImpl>(new MessageDigestSHA1());
+  return make_unique<MessageDigestSHA1>();
 }
 
 MessageDigestImpl::hashes_t MessageDigestImpl::hashes = {

+ 1 - 1
src/MessageDigestImpl.h

@@ -40,7 +40,7 @@
 
 #include <string>
 #include <memory>
-#include <functional> 
+#include <functional>
 #include <map>
 #include <tuple>