| Index: net/disk_cache/simple/simple_util.cc
|
| diff --git a/net/disk_cache/simple/simple_util.cc b/net/disk_cache/simple/simple_util.cc
|
| index 4feeeecaf0c9185f3f835803278a320d42e8a1ac..a3497df750bb45566e134c3692d30a66765e34f9 100644
|
| --- a/net/disk_cache/simple/simple_util.cc
|
| +++ b/net/disk_cache/simple/simple_util.cc
|
| @@ -75,7 +75,8 @@ uint64 GetEntryHashKey(const std::string& key) {
|
| uint64 key_hash;
|
| } u;
|
| base::SHA1HashBytes(reinterpret_cast<const unsigned char*>(key.data()),
|
| - key.size(), u.sha_hash);
|
| + key.size(),
|
| + u.sha_hash);
|
| return u.key_hash;
|
| }
|
|
|
| @@ -95,15 +96,15 @@ std::string GetFilenameFromKeyAndFileIndex(const std::string& key,
|
| }
|
|
|
| int32 GetDataSizeFromKeyAndFileSize(const std::string& key, int64 file_size) {
|
| - int64 data_size = file_size - key.size() - sizeof(SimpleFileHeader) -
|
| - sizeof(SimpleFileEOF);
|
| + int64 data_size =
|
| + file_size - key.size() - sizeof(SimpleFileHeader) - sizeof(SimpleFileEOF);
|
| DCHECK_GE(implicit_cast<int64>(std::numeric_limits<int32>::max()), data_size);
|
| return data_size;
|
| }
|
|
|
| int64 GetFileSizeFromKeyAndDataSize(const std::string& key, int32 data_size) {
|
| return data_size + key.size() + sizeof(SimpleFileHeader) +
|
| - sizeof(SimpleFileEOF);
|
| + sizeof(SimpleFileEOF);
|
| }
|
|
|
| int GetFileIndexFromStreamIndex(int stream_index) {
|
| @@ -122,8 +123,8 @@ bool GetMTime(const base::FilePath& path, base::Time* out_mtime) {
|
| long nsec;
|
| if (GetNanoSecsFromStat(file_stat, &sec, &nsec)) {
|
| int64 usec = (nsec / base::Time::kNanosecondsPerMicrosecond);
|
| - *out_mtime = base::Time::FromTimeT(sec)
|
| - + base::TimeDelta::FromMicroseconds(usec);
|
| + *out_mtime =
|
| + base::Time::FromTimeT(sec) + base::TimeDelta::FromMicroseconds(usec);
|
| return true;
|
| }
|
| #endif
|
|
|