1 files changed, 5 insertions, 58 deletions

diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index 169a46b2c..49b9a0ef5 100644
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -22,11 +22,9 @@
 #include <stdio.h>
 
 #include "contents.h"
-#include "sources.h"
 
 class FileFd;
 
-
 class CacheDB
 {
    protected:
@@ -41,7 +39,7 @@ class CacheDB
    std::string DBFile;
 
    // Generate a key for the DB of a given type
-   void _InitQuery(const char *Type)
+   inline void InitQuery(const char *Type)
    {
       memset(&Key,0,sizeof(Key));
       memset(&Data,0,sizeof(Data));
@@ -49,19 +47,6 @@ class CacheDB
       Key.size = snprintf(TmpKey,sizeof(TmpKey),"%s:%s",FileName.c_str(), Type);
    }
    
-   void InitQueryStats() {
-      _InitQuery("st");
-   }
-   void InitQuerySource() {
-      _InitQuery("cs");
-   }
-   void InitQueryControl() {
-      _InitQuery("cl");
-   }
-   void InitQueryContent() {
-      _InitQuery("cn");
-   }
-
    inline bool Get() 
    {
       return Dbp->get(Dbp,0,&Key,&Data,0) == 0;
@@ -80,20 +65,10 @@ class CacheDB
       return true;
    }
    bool OpenFile();
-   void CloseFile();
-
-   bool OpenDebFile();
-   void CloseDebFile();
-
-   // GetCurStat needs some compat code, see lp #1274466)
-   bool GetCurStatCompatOldFormat();
-   bool GetCurStatCompatNewFormat();
-   bool GetCurStat();
-
    bool GetFileStat(bool const &doStat = false);
+   bool GetCurStat();
    bool LoadControl();
    bool LoadContents(bool const &GenOnly);
-   bool LoadSource();
    bool GetMD5(bool const &GenOnly);
    bool GetSHA1(bool const &GenOnly);
    bool GetSHA256(bool const &GenOnly);
@@ -102,23 +77,8 @@ class CacheDB
    // 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),
-   };
-
-   // the on-disk format changed (FileSize increased to 64bit) in 
-   // commit 650faab0 which will lead to corruption with old caches
-   struct StatStoreOldFormat
-   {
-      uint32_t Flags;
-      uint32_t mtime;
-      uint32_t FileSize;
-      uint8_t  MD5[16];
-      uint8_t  SHA1[20];
-      uint8_t  SHA256[32];
-   } CurStatOldFormat;
+                  FlSHA512=(1<<6)};
 
-   // WARNING: this struct is read/written to the DB so do not change the
-   //          layout of the fields (see lp #1274466), only append to it
    struct StatStore
    {
       uint32_t Flags;
@@ -141,8 +101,6 @@ class CacheDB
    // Data collection helpers
    debDebFile::MemControlExtract Control;
    ContentsExtract Contents;
-   DscExtract Dsc;
-
    std::string MD5Res;
    std::string SHA1Res;
    std::string SHA256Res;
@@ -181,19 +139,8 @@ class CacheDB
    inline unsigned long long GetFileSize(void) {return CurStat.FileSize;}
    
    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 &DoMD5, bool const &DoSHA1, bool const &DoSHA256, bool const &DoSHA512, bool const &checkMtime = false);
    bool Finish();   
    
    bool Clean();