*/
/*}}} */
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/sha1.h"
-#endif
-
#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 <system.h>
/*}}}*/
// SHA1Transform - Alters an existing SHA-1 hash /*{{{*/
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;