* merged from apt--mvo

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

diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index d7f6069827ddf2c3e91b0109dd9548df5b3879a3..b70f31dc6792619dea08ca492ecac8f6afc88b1a 100644 (file)
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -29,10 +29,6 @@
  */
                                                                        /*}}} */
 // Include Files                                                        /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/sha1.h"
-#endif
-
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/strutl.h>
 
@@ -344,10 +340,10 @@ bool SHA1Summation::AddFD(int Fd,unsigned long Size)
    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;