tests: fail testsuccess if notices are shown, too

[apt.git] / ftparchive / cachedb.h

diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index 29d710d2c51292d6d43cfbe8a982f5356d1bc30f..417c25a9fb22764eb8e44381f19517aaa01927ee 100644 (file)
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -12,6 +12,7 @@
 #ifndef CACHEDB_H
 #define CACHEDB_H
 
 #ifndef CACHEDB_H
 #define CACHEDB_H
 

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

 #include <apt-pkg/debfile.h>
 
 #include <db.h>
 #include <apt-pkg/debfile.h>
 
 #include <db.h>


@@ -94,15 +95,12 @@ class CacheDB
    bool LoadControl();
    bool LoadContents(bool const &GenOnly);
    bool LoadSource();
    bool LoadControl();
    bool LoadContents(bool const &GenOnly);
    bool LoadSource();

-   bool GetMD5(bool const &GenOnly);
-   bool GetSHA1(bool const &GenOnly);
-   bool GetSHA256(bool const &GenOnly);
-   bool GetSHA512(bool const &GenOnly);
-   
+   bool GetHashes(bool const GenOnly, unsigned int const DoHashes);
+

    // 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), 
-                  FlSHA512=(1<<6), FlSource=(1<<7),
+                  FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5),
+                  FlSHA512=(1<<6), FlSource=(1<<7)

    };
 
    // the on-disk format changed (FileSize increased to 64bit) in 
    };
 
    // the on-disk format changed (FileSize increased to 64bit) in 


@@ -142,12 +140,8 @@ class CacheDB
    debDebFile::MemControlExtract Control;
    ContentsExtract Contents;
    DscExtract Dsc;
    debDebFile::MemControlExtract Control;
    ContentsExtract Contents;
    DscExtract Dsc;

+   HashStringList HashesList;

 
 

-   std::string MD5Res;
-   std::string SHA1Res;
-   std::string SHA256Res;
-   std::string SHA512Res;
-   

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


@@ -183,22 +177,19 @@ class CacheDB
    bool SetFile(std::string const &FileName,struct stat St,FileFd *Fd);
 
    // terrible old overloaded interface
    bool SetFile(std::string const &FileName,struct stat St,FileFd *Fd);
 
    // terrible old overloaded interface

-   bool GetFileInfo(std::string const &FileName, 
-                    bool const &DoControl, 
-                    bool const &DoContents, 
-                    bool const &GenContentsOnly, 
-                    bool const &DoSource,
-                   bool const &DoMD5, 
-                    bool const &DoSHA1, 
-                    bool const &DoSHA256, 
-                    bool const &DoSHA512, 
-                    bool const &checkMtime = false);
+   bool GetFileInfo(std::string const &FileName,
+        bool const &DoControl,
+        bool const &DoContents,
+        bool const &GenContentsOnly,
+        bool const DoSource,
+        unsigned int const DoHashes,
+        bool const &checkMtime = false);

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

-   CacheDB(std::string const &DB);
+   explicit CacheDB(std::string const &DB);

    ~CacheDB();
 };
     
    ~CacheDB();
 };