Doc fixes and copy method patch

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

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index ff397bfacf5e3c671039cd2304dd93ca7d6a878f..4c22ecf6faf75daae804cda44e399dc4448a87ae 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.8 1998/07/21 05:33:20 jgg Exp $
+// $Id: pkgcachegen.h,v 1.11 1998/12/14 02:23:47 jgg Exp $
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
@@ -25,13 +25,16 @@
 #endif 
 
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/progress.h>
+
+class pkgSourceList;
+class OpProgress;
 
 class pkgCacheGenerator
 {
    public:
    
    class ListParser;
+   friend ListParser;
    
    protected:
    
@@ -49,48 +52,53 @@ class pkgCacheGenerator
    unsigned long WriteUniqString(const char *S,unsigned int Size);
    inline unsigned long WriteUniqString(string S) {return WriteUniqString(S);};
    
-   public:
-   
-   // This is the abstract package list parser class.
-   class ListParser
-   {
-      pkgCacheGenerator *Owner;
-      friend pkgCacheGenerator;
-      
-      protected:
-      
-      inline unsigned long WriteUniqString(string S) {return Owner->WriteUniqString(S);};
-      inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);};
-      inline unsigned long WriteString(string S) {return Owner->Map.WriteString(S);};
-      inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);};
-      bool NewDepends(pkgCache::VerIterator Ver,string Package,
-                        string Version,unsigned int Op,
-                        unsigned int Type);
-      bool NewProvides(pkgCache::VerIterator Ver,string Package,string Version);
-      
-      public:
-      
-      // These all operate against the current section
-      virtual string Package() = 0;
-      virtual string Version() = 0;
-      virtual bool NewVersion(pkgCache::VerIterator Ver) = 0;
-      virtual bool UsePackage(pkgCache::PkgIterator Pkg,
-                             pkgCache::VerIterator Ver) = 0;
-      virtual unsigned long Offset() = 0;
-      virtual unsigned long Size() = 0;
-      
-      virtual bool Step() = 0;
-      
-      virtual ~ListParser() {};
-   };
-   friend ListParser;
+   public:   
 
    bool SelectFile(string File,unsigned long Flags = 0);
    bool MergeList(ListParser &List);
    inline pkgCache &GetCache() {return Cache;};
+   inline pkgCache::PkgFileIterator GetCurFile() 
+         {return pkgCache::PkgFileIterator(Cache,CurrentFile);};
       
    pkgCacheGenerator(DynamicMMap &Map,OpProgress &Progress);
    ~pkgCacheGenerator();
 };
 
+bool pkgSrcCacheCheck(pkgSourceList &List);
+bool pkgPkgCacheCheck(string CacheFile);
+bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress);
+
+// This is the abstract package list parser class.
+class pkgCacheGenerator::ListParser
+{
+   pkgCacheGenerator *Owner;
+   friend pkgCacheGenerator;
+   
+   protected:
+   
+   inline unsigned long WriteUniqString(string S) {return Owner->WriteUniqString(S);};
+   inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);};
+   inline unsigned long WriteString(string S) {return Owner->Map.WriteString(S);};
+   inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);};
+   bool NewDepends(pkgCache::VerIterator Ver,string Package,
+                  string Version,unsigned int Op,
+                  unsigned int Type);
+   bool NewProvides(pkgCache::VerIterator Ver,string Package,string Version);
+   
+   public:
+   
+   // These all operate against the current section
+   virtual string Package() = 0;
+   virtual string Version() = 0;
+   virtual bool NewVersion(pkgCache::VerIterator Ver) = 0;
+   virtual bool UsePackage(pkgCache::PkgIterator Pkg,
+                          pkgCache::VerIterator Ver) = 0;
+   virtual unsigned long Offset() = 0;
+   virtual unsigned long Size() = 0;
+   
+   virtual bool Step() = 0;
+   
+   virtual ~ListParser() {};
+};
+
 #endif