SkMD5: .update() -> .write()

Review URL: https://codereview.chromium.org/1913173003

diff --git a/bench/ChecksumBench.cpp b/bench/ChecksumBench.cpp
index cba9572aa330974529dbc85d67a6805a418c9859..4c2ac1a3962c634696a2dc35601c7cdc4130a3c3 100644 (file)
--- a/bench/ChecksumBench.cpp
+++ b/bench/ChecksumBench.cpp
@@ -51,7 +51,7 @@ protected:
             case kMD5_ChecksumType: {
                 for (int i = 0; i < loops; i++) {
                     SkMD5 md5;
-                    md5.update(reinterpret_cast<uint8_t*>(fData), sizeof(fData));
+                    md5.write(fData, sizeof(fData));
                     SkMD5::Digest digest;
                     md5.finish(digest);
                 }

diff --git a/src/core/SkMD5.cpp b/src/core/SkMD5.cpp
index 5c86522a54306116517d40c40f8b85ef2f74fb8f..c0c3c31fb759ae91d8f176283f2261d8b4bd0189 100644 (file)
--- a/src/core/SkMD5.cpp
+++ b/src/core/SkMD5.cpp
@@ -80,10 +80,10 @@ void SkMD5::finish(Digest& digest) {
            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     };
-    this->update(PADDING, paddingLength);
+    (void)this->write(PADDING, paddingLength);
 
     // Append length (length before padding, will cause final update).
-    this->update(bits, 8);
+    (void)this->write(bits, 8);
 
     // Write out digest.
     encode(digest.data, this->state);

diff --git a/src/core/SkMD5.h b/src/core/SkMD5.h
index a6d9b9f3ebb91ea864ff5e6ab4d356cec2e48ba5..8838d47ac07d04ce224ada019114d496ea29c6e6 100644 (file)
--- a/src/core/SkMD5.h
+++ b/src/core/SkMD5.h
@@ -21,9 +21,6 @@ public:
 
     size_t bytesWritten() const final { return SkToSizeT(this->byteCount); }
 
-    /** Alias for write() */
-    void update(const uint8_t* b, size_t l) { (void)this->write(b, l); }
-
     struct Digest {
         uint8_t data[16];
         bool operator ==(Digest const& other) const {

diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp
index bdb5e7792e983c686a3de82a4d4064da76846d73..5ac19d9f7050efccd5ba34f364a851d8c77efd88 100644 (file)
--- a/tests/CodecTest.cpp
+++ b/tests/CodecTest.cpp
@@ -32,7 +32,7 @@ static void md5(const SkBitmap& bm, SkMD5::Digest* digest) {
     SkMD5 md5;
     size_t rowLen = bm.info().bytesPerPixel() * bm.width();
     for (int y = 0; y < bm.height(); ++y) {
-        md5.update(static_cast<uint8_t*>(bm.getAddr(0, y)), rowLen);
+        md5.write(bm.getAddr(0, y), rowLen);
     }
     md5.finish(*digest);
 }

diff --git a/tests/MD5Test.cpp b/tests/MD5Test.cpp
index efad26d48512851ff7905102b05276ac947c4eb2..214a7a80e87410c84295bb9523081cc6605dac6c 100644 (file)
--- a/tests/MD5Test.cpp
+++ b/tests/MD5Test.cpp
@@ -23,7 +23,7 @@ static void md5_test(const char* string, const SkMD5::Digest& expectedDigest, sk
     // All at once
     {
         SkMD5 context;
-        context.update(reinterpret_cast<const uint8_t*>(string), len);
+        context.write(string, len);
         SkMD5::Digest digest;
         context.finish(digest);
 
@@ -36,7 +36,7 @@ static void md5_test(const char* string, const SkMD5::Digest& expectedDigest, sk
         const uint8_t* data = reinterpret_cast<const uint8_t*>(string);
         const uint8_t* end = reinterpret_cast<const uint8_t*>(string + len);
         for (; data < end; ++data) {
-            context.update(data, 1);
+            context.write(data, 1);
         }
         SkMD5::Digest digest;
         context.finish(digest);

diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index f6ed59e81a9af0e82a2491a7c4e8cfc8918e2954..9e36d841df4535a6497e6edb057e72d4db5b7a38 100644 (file)
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -874,7 +874,7 @@ static void md5(const SkBitmap& bm, SkMD5::Digest* digest) {
     SkMD5 md5;
     size_t rowLen = bm.info().bytesPerPixel() * bm.width();
     for (int y = 0; y < bm.height(); ++y) {
-        md5.update(static_cast<uint8_t*>(bm.getAddr(0, y)), rowLen);
+        md5.write(bm.getAddr(0, y), rowLen);
     }
     md5.finish(*digest);
 }