| Index: net/base/hash_value.cc
|
| diff --git a/net/base/hash_value.cc b/net/base/hash_value.cc
|
| index 9ae1412058d5baf7f096b1bdc3c5aa631e05dd75..17eebe176ad9e5ccb0b39b8c5dae0cfa9929bc1d 100644
|
| --- a/net/base/hash_value.cc
|
| +++ b/net/base/hash_value.cc
|
| @@ -22,7 +22,6 @@ int CompareSHA1Hashes(const void* a, const void* b) {
|
|
|
| } // namespace
|
|
|
| -
|
| bool SHA1HashValue::Equals(const SHA1HashValue& other) const {
|
| return memcmp(data, other.data, sizeof(data)) == 0;
|
| }
|
| @@ -67,16 +66,17 @@ bool HashValue::FromString(const base::StringPiece value) {
|
|
|
| std::string HashValue::ToString() const {
|
| std::string base64_str;
|
| - base::Base64Encode(base::StringPiece(reinterpret_cast<const char*>(data()),
|
| - size()), &base64_str);
|
| + base::Base64Encode(
|
| + base::StringPiece(reinterpret_cast<const char*>(data()), size()),
|
| + &base64_str);
|
| switch (tag) {
|
| - case HASH_VALUE_SHA1:
|
| - return std::string("sha1/") + base64_str;
|
| - case HASH_VALUE_SHA256:
|
| - return std::string("sha256/") + base64_str;
|
| - default:
|
| - NOTREACHED() << "Unknown HashValueTag " << tag;
|
| - return std::string("unknown/" + base64_str);
|
| + case HASH_VALUE_SHA1:
|
| + return std::string("sha1/") + base64_str;
|
| + case HASH_VALUE_SHA256:
|
| + return std::string("sha256/") + base64_str;
|
| + default:
|
| + NOTREACHED() << "Unknown HashValueTag " << tag;
|
| + return std::string("unknown/" + base64_str);
|
| }
|
| }
|
|
|
| @@ -116,8 +116,9 @@ bool IsSHA1HashInSortedArray(const SHA1HashValue& hash,
|
| size_t array_byte_len) {
|
| DCHECK_EQ(0u, array_byte_len % base::kSHA1Length);
|
| const size_t arraylen = array_byte_len / base::kSHA1Length;
|
| - return NULL != bsearch(hash.data, array, arraylen, base::kSHA1Length,
|
| - CompareSHA1Hashes);
|
| + return NULL !=
|
| + bsearch(
|
| + hash.data, array, arraylen, base::kSHA1Length, CompareSHA1Hashes);
|
| }
|
|
|
| } // namespace net
|
|
|