* cleanups

[apt.git] / apt-pkg / pkgcachegen.h

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 2bdabcee0ff7bd1113fbef567e3a3911aceb79dc..7d092062929b892bdf6250430ba8b056100419b5 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: pkgcachegen.h,v 1.16 1999/07/15 03:15:48 jgg Exp $
+// $Id: pkgcachegen.h,v 1.19 2002/07/08 03:13:30 jgg Exp $
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
@@ -16,7 +16,6 @@
    
    ##################################################################### */
                                                                        /*}}}*/
-// Header section: pkglib
 #ifndef PKGLIB_PKGCACHEGEN_H
 #define PKGLIB_PKGCACHEGEN_H
 
@@ -29,6 +28,7 @@
 class pkgSourceList;
 class OpProgress;
 class MMap;
+class pkgIndexFile;
 
 class pkgCacheGenerator
 {
@@ -39,50 +39,56 @@ class pkgCacheGenerator
    public:
    
    class ListParser;
-   friend ListParser;
+   friend class ListParser;
    
    protected:
    
    DynamicMMap ⤅
    pkgCache Cache;
-   OpProgress &Progress;
+   OpProgress *Progress;
    
    string PkgFileName;
    pkgCache::PackageFile *CurrentFile;
+
+   // Flag file dependencies
+   bool FoundFileDeps;
    
    bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg);
    bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
    unsigned long NewVersion(pkgCache::VerIterator &Ver,string VerStr,unsigned long Next);
 
+   public:
+
    unsigned long WriteUniqString(const char *S,unsigned int Size);
    inline unsigned long WriteUniqString(string S) {return WriteUniqString(S.c_str(),S.length());};
 
-   public:   
-
-   bool SelectFile(string File,unsigned long Flags = 0);
-   bool MergeList(ListParser &List);
+   void DropProgress() {Progress = 0;};
+   bool SelectFile(string File,string Site,pkgIndexFile const &Index,
+                  unsigned long Flags = 0);
+   bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0);
    inline pkgCache &GetCache() {return Cache;};
    inline pkgCache::PkgFileIterator GetCurFile() 
          {return pkgCache::PkgFileIterator(Cache,CurrentFile);};
+
+   bool HasFileDeps() {return FoundFileDeps;};
+   bool MergeFileProvides(ListParser &List);
       
-   pkgCacheGenerator(DynamicMMap &Map,OpProgress &Progress);
+   pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress);
    ~pkgCacheGenerator();
 };
 
-bool pkgSrcCacheCheck(pkgSourceList &List);
-bool pkgPkgCacheCheck(string CacheFile);
-bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress);
-MMap *pkgMakeStatusCacheMem(pkgSourceList &List,OpProgress &Progress);
-
 // This is the abstract package list parser class.
 class pkgCacheGenerator::ListParser
 {
    pkgCacheGenerator *Owner;
-   friend pkgCacheGenerator;
+   friend class pkgCacheGenerator;
    
    // Some cache items
    pkgCache::VerIterator OldDepVer;
    map_ptrloc *OldDepLast;
+
+   // Flag file dependencies
+   bool FoundFileDeps;
       
    protected:
 
@@ -109,7 +115,29 @@ class pkgCacheGenerator::ListParser
    
    virtual bool Step() = 0;
    
+   inline bool HasFileDeps() {return FoundFileDeps;};
+   virtual bool CollectFileProvides(pkgCache &Cache,
+                                   pkgCache::VerIterator Ver) {return true;};
+
+   ListParser() : FoundFileDeps(false) {};
    virtual ~ListParser() {};
 };
 
+bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
+                       MMap **OutMap = 0,bool AllowMem = false);
+bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap);
+
+#ifdef APT_COMPATIBILITY
+#if APT_COMPATIBILITY != 986
+#warning "Using APT_COMPATIBILITY"
+#endif
+MMap *pkgMakeStatusCacheMem(pkgSourceList &List,OpProgress &Progress)
+{
+   MMap *Map = 0;
+   if (pkgMakeStatusCache(List,Progress,&Map,true) == false)
+      return 0;
+   return Map;
+}
+#endif
+
 #endif