* merged changes from Kamions upload (thanks!)

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

diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index d7f6069827ddf2c3e91b0109dd9548df5b3879a3..72eafd4ca357a6b8804996361effc371bbe71563 100644 (file)
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -344,10 +344,10 @@ bool SHA1Summation::AddFD(int Fd,unsigned long Size)
    unsigned char Buf[64 * 64];
    int Res = 0;
    int ToEOF = (Size == 0);
    unsigned char Buf[64 * 64];
    int Res = 0;
    int ToEOF = (Size == 0);

-   while (Size != 0 || ToEOF);
+   while (Size != 0 || ToEOF)

    {
    {

-      int n = sizeof(Buf);
-      if (!ToEOF) n = MIN(Size,n);
+      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;
       Res = read(Fd,Buf,n);
       if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
         return false;