merged from the debian-sid branch

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

diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index d7f6069827ddf2c3e91b0109dd9548df5b3879a3..eae52d52f6341ea22abdb3ee3493bd48c3407316 100644 (file)
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -29,18 +29,14 @@
  */
                                                                        /*}}} */
 // Include Files                                                        /*{{{*/
  */
                                                                        /*}}} */
 // Include Files                                                        /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/sha1.h"
-#endif
-

 #include <apt-pkg/sha1.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/strutl.h>

+#include <apt-pkg/macros.h>

 
 #include <string.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include <config.h>
 
 #include <string.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include <config.h>

-#include <system.h>

                                                                        /*}}}*/
 
 // SHA1Transform - Alters an existing SHA-1 hash                       /*{{{*/
                                                                        /*}}}*/
 
 // SHA1Transform - Alters an existing SHA-1 hash                       /*{{{*/


@@ -344,10 +340,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;