diff options
author | Michael Vogt <mvo@debian.org> | 2014-05-07 18:10:01 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-05-07 18:10:01 +0200 |
commit | 41a658f873a36e2f8507a84fb40f0632e2a62b15 (patch) | |
tree | 1acf5649b42fe6142a2b436ef6a89429659f05e6 /apt-pkg | |
parent | 48127e85281e3e75d9aa60abca97f7c5c2c92fad (diff) | |
parent | cf6bbca0a93b21ab7d3378f26dd9b57951a1d987 (diff) |
Merge remote-tracking branch 'mvo/feature/apt-ftparchive-srccache2' into debian/sid
Diffstat (limited to 'apt-pkg')
-rw-r--r-- | apt-pkg/contrib/hashes.cc | 2 | ||||
-rw-r--r-- | apt-pkg/contrib/hashes.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index 1fce0d75f..15f83615d 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -133,7 +133,7 @@ bool Hashes::AddFD(int const Fd,unsigned long long Size, bool const addMD5, bool const addSHA1, bool const addSHA256, bool const addSHA512) { unsigned char Buf[64*64]; - bool const ToEOF = (Size == 0); + bool const ToEOF = (Size == UntilEOF); while (Size != 0 || ToEOF) { unsigned long long n = sizeof(Buf); diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index 5cd1af03b..7a62f8a8f 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -78,6 +78,8 @@ class Hashes SHA256Summation SHA256; SHA512Summation SHA512; + static const int UntilEOF = 0; + inline bool Add(const unsigned char *Data,unsigned long long Size) { return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size) && SHA512.Add(Data,Size); |