merged from donkult

[apt.git] / ftparchive / cachedb.h

diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index 0ba80909ae557ae1737e137f440efd76881197dc..6bd5aa36c34c162b64e86ed7c439a058452f10be 100644 (file)
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -70,18 +70,22 @@ class CacheDB
    bool GetMD5(bool const &GenOnly);
    bool GetSHA1(bool const &GenOnly);
    bool GetSHA256(bool const &GenOnly);
    bool GetMD5(bool const &GenOnly);
    bool GetSHA1(bool const &GenOnly);
    bool GetSHA256(bool const &GenOnly);

+   bool GetSHA512(bool const &GenOnly);

    
    // Stat info stored in the DB, Fixed types since it is written to disk.
    enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2),
    
    // Stat info stored in the DB, Fixed types since it is written to disk.
    enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2),

-       FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5)};
+                  FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5), 
+                  FlSHA512=(1<<6)};
+

    struct StatStore
    {
       uint32_t Flags;
       uint32_t mtime;          
    struct StatStore
    {
       uint32_t Flags;
       uint32_t mtime;          

-      uint32_t FileSize;
+      uint64_t FileSize;

       uint8_t  MD5[16];
       uint8_t  SHA1[20];
       uint8_t  SHA256[32];
       uint8_t  MD5[16];
       uint8_t  SHA1[20];
       uint8_t  SHA256[32];

+      uint8_t  SHA512[64];

    } CurStat;
    struct StatStore OldStat;
    
    } CurStat;
    struct StatStore OldStat;
    


@@ -98,6 +102,7 @@ class CacheDB
    string MD5Res;
    string SHA1Res;
    string SHA256Res;
    string MD5Res;
    string SHA1Res;
    string SHA256Res;

+   string SHA512Res;

    
    // Runtime statistics
    struct Stats
    
    // Runtime statistics
    struct Stats


@@ -106,14 +111,21 @@ class CacheDB
       double MD5Bytes;
       double SHA1Bytes;
       double SHA256Bytes;
       double MD5Bytes;
       double SHA1Bytes;
       double SHA256Bytes;

+      double SHA512Bytes;

       unsigned long Packages;
       unsigned long Misses;  
       unsigned long Packages;
       unsigned long Misses;  

-      unsigned long DeLinkBytes;
+      unsigned long long DeLinkBytes;

       
       inline void Add(const Stats &S) {
       
       inline void Add(const Stats &S) {

-        Bytes += S.Bytes; MD5Bytes += S.MD5Bytes; SHA1Bytes += S.SHA1Bytes; 
+        Bytes += S.Bytes; 
+         MD5Bytes += S.MD5Bytes; 
+         SHA1Bytes += S.SHA1Bytes; 

         SHA256Bytes += S.SHA256Bytes;
         SHA256Bytes += S.SHA256Bytes;

-        Packages += S.Packages; Misses += S.Misses; DeLinkBytes += S.DeLinkBytes;};
+        SHA512Bytes += S.SHA512Bytes;
+        Packages += S.Packages;
+         Misses += S.Misses; 
+         DeLinkBytes += S.DeLinkBytes;
+      };

       Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {};
    } Stats;
    
       Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {};
    } Stats;
    


@@ -121,11 +133,11 @@ class CacheDB
    inline bool DBFailed() {return Dbp != 0 && DBLoaded == false;};
    inline bool Loaded() {return DBLoaded == true;};
    
    inline bool DBFailed() {return Dbp != 0 && DBLoaded == false;};
    inline bool Loaded() {return DBLoaded == true;};
    

-   inline off_t GetFileSize(void) {return CurStat.FileSize;}
+   inline unsigned long long GetFileSize(void) {return CurStat.FileSize;}

    
    bool SetFile(string const &FileName,struct stat St,FileFd *Fd);
    bool GetFileInfo(string const &FileName, bool const &DoControl, bool const &DoContents, bool const &GenContentsOnly,
    
    bool SetFile(string const &FileName,struct stat St,FileFd *Fd);
    bool GetFileInfo(string const &FileName, bool const &DoControl, bool const &DoContents, bool const &GenContentsOnly,

-                   bool const &DoMD5, bool const &DoSHA1, bool const &DoSHA256, bool const &checkMtime = false);
+                   bool const &DoMD5, bool const &DoSHA1, bool const &DoSHA256, bool const &DoSHA512, bool const &checkMtime = false);

    bool Finish();   
    
    bool Clean();
    bool Finish();   
    
    bool Clean();