merged from donkult

[apt.git] / apt-pkg / contrib / hashsum.cc

diff --git a/apt-pkg/contrib/hashsum.cc b/apt-pkg/contrib/hashsum.cc
index b97eaf831195d84946e58c41e26ddf514e8ebae7..728747d7ab00ed47b44cc36706ae88daf549d994 100644 (file)
--- a/apt-pkg/contrib/hashsum.cc
+++ b/apt-pkg/contrib/hashsum.cc
@@ -10,11 +10,10 @@ bool SummationImplementation::AddFD(int const Fd, unsigned long Size) {
    unsigned char Buf[64 * 64];
    int Res = 0;
    int ToEOF = (Size == 0);
-   unsigned long n = sizeof(Buf);
-   if (!ToEOF)
-      n = std::min(Size, n);
    while (Size != 0 || ToEOF)
    {
+      unsigned n = sizeof(Buf);
+      if (!ToEOF) n = min(Size,(unsigned long)n);
       Res = read(Fd, Buf, n);
       if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
         return false;