* merged changes from Kamions upload (thanks!)

[apt.git] / apt-pkg / contrib / hashes.h

diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index e00eaeb2d1877b295fe93665a602f43c279fd792..40bbe00a02673edae48a0cd23f78cd018435de26 100644 (file)
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: hashes.h,v 1.1 2001/03/06 07:15:29 jgg Exp $
+// $Id: hashes.h,v 1.2 2001/03/11 05:30:20 jgg Exp $
 /* ######################################################################
 
    Hashes - Simple wrapper around the hash functions
@@ -14,12 +14,16 @@
 #define APTPKG_HASHES_H
 
 #ifdef __GNUG__
-#pragma interface "apt-pkg/hashesh.h"
+#pragma interface "apt-pkg/hashes.h"
 #endif 
 
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
 
+#include <algorithm>
+
+using std::min;
+
 class Hashes
 {
    public:
@@ -29,8 +33,7 @@ class Hashes
    
    inline bool Add(const unsigned char *Data,unsigned long Size)
    {
-      MD5.Add(Data,Size);
-      SHA1.Add(Data,Size);
+      return MD5.Add(Data,Size) && SHA1.Add(Data,Size);
    };
    inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));};
    bool AddFD(int Fd,unsigned long Size);