- provide a {Package,Version}List similar to {Package,Version}Set

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

diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index e702fcca2fd9459d2fd2e66f1b95aaf94bd764ca..81851dedeb2d3b0f47c6de3a9f06ccedf24394c4 100644 (file)
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -22,31 +22,28 @@
 #include <vector>
 #include <cstring>
 
 #include <vector>
 #include <cstring>
 

-using std::min;
-using std::vector;
-

 // helper class that contains hash function name
 // and hash
 class HashString
 {
  protected:
 // helper class that contains hash function name
 // and hash
 class HashString
 {
  protected:

-   string Type;
-   string Hash;
+   std::string Type;
+   std::string Hash;

    static const char * _SupportedHashes[10];
 
  public:
    static const char * _SupportedHashes[10];
 
  public:

-   HashString(string Type, string Hash);
-   HashString(string StringedHashString);  // init from str as "type:hash"
+   HashString(std::string Type, std::string Hash);
+   HashString(std::string StringedHashString);  // init from str as "type:hash"

    HashString();
 
    // get hash type used
    HashString();
 
    // get hash type used

-   string HashType() { return Type; };
+   std::string HashType() { return Type; };

 
    // verify the given filename against the currently loaded hash
 
    // verify the given filename against the currently loaded hash

-   bool VerifyFile(string filename) const;
+   bool VerifyFile(std::string filename) const;

 
    // helper
 
    // helper

-   string toStr() const;                    // convert to str as "type:hash"
+   std::string toStr() const;                    // convert to str as "type:hash"

    bool empty() const;
 
    // return the list of hashes we support
    bool empty() const;
 
    // return the list of hashes we support


@@ -62,14 +59,14 @@ class Hashes
    SHA256Summation SHA256;
    SHA512Summation SHA512;
    
    SHA256Summation SHA256;
    SHA512Summation SHA512;
    

-   inline bool Add(const unsigned char *Data,unsigned long Size)
+   inline bool Add(const unsigned char *Data,unsigned long long Size)

    {
       return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size) && SHA512.Add(Data,Size);
    };
    inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));};
    {
       return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size) && SHA512.Add(Data,Size);
    };
    inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));};

-   inline bool AddFD(int const Fd,unsigned long Size = 0)
+   inline bool AddFD(int const Fd,unsigned long long Size = 0)

    { return AddFD(Fd, Size, true, true, true, true); };
    { return AddFD(Fd, Size, true, true, true, true); };

-   bool AddFD(int const Fd, unsigned long Size, bool const addMD5,
+   bool AddFD(int const Fd, unsigned long long Size, bool const addMD5,

              bool const addSHA1, bool const addSHA256, bool const addSHA512);
    inline bool Add(const unsigned char *Beg,const unsigned char *End) 
                   {return Add(Beg,End-Beg);};
              bool const addSHA1, bool const addSHA256, bool const addSHA512);
    inline bool Add(const unsigned char *Beg,const unsigned char *End) 
                   {return Add(Beg,End-Beg);};