merge with debian-experimental 0.8.16~exp2 release

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

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 6891c1d81c448378d08d948bbc4af10beb75d602..23f5c57e6df33361df220bea05dd40610a98b483 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -23,16 +23,16 @@
 
 #include <apt-pkg/fileutl.h>
 #include <stdio.h>
 
 #include <apt-pkg/fileutl.h>
 #include <stdio.h>

-    
+

 class pkgTagSection
 {
    const char *Section;
 class pkgTagSection
 {
    const char *Section;

-   

    // We have a limit of 256 tags per section.
    unsigned int Indexes[256];
    unsigned int AlphaIndexes[0x100];
    // We have a limit of 256 tags per section.
    unsigned int Indexes[256];
    unsigned int AlphaIndexes[0x100];

-   

    unsigned int TagCount;
    unsigned int TagCount;

+   // dpointer placeholder (for later in case we need it)
+   void *d;

 
    /* This very simple hash function for the last 8 letters gives
       very good performance on the debian package files */
 
    /* This very simple hash function for the last 8 letters gives
       very good performance on the debian package files */


@@ -44,7 +44,6 @@ class pkgTagSection
       return Res & 0xFF;
    }
 
       return Res & 0xFF;
    }
 

-

    protected:
    const char *Stop;
 
    protected:
    const char *Stop;
 


@@ -60,6 +59,8 @@ class pkgTagSection
    unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const;
    bool FindFlag(const char *Tag,unsigned long &Flags,
                 unsigned long Flag) const;
    unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const;
    bool FindFlag(const char *Tag,unsigned long &Flags,
                 unsigned long Flag) const;

+   bool static const FindFlag(unsigned long &Flags, unsigned long Flag,
+                               const char* Start, const char* Stop);

    bool Scan(const char *Start,unsigned long MaxLength);
    inline unsigned long size() const {return Stop - Section;};
    void Trim();
    bool Scan(const char *Start,unsigned long MaxLength);
    inline unsigned long size() const {return Stop - Section;};
    void Trim();


@@ -78,17 +79,13 @@ class pkgTagSection
    };
    
    pkgTagSection() : Section(0), Stop(0) {};
    };
    
    pkgTagSection() : Section(0), Stop(0) {};

+   virtual ~pkgTagSection() {};

 };
 
 };
 

+class pkgTagFilePrivate;

 class pkgTagFile
 {
 class pkgTagFile
 {

-   FileFd &Fd;
-   char *Buffer;
-   char *Start;
-   char *End;
-   bool Done;
-   unsigned long iOffset;
-   unsigned long Size;
+   pkgTagFilePrivate *d;

 
    bool Fill();
    bool Resize();
 
    bool Fill();
    bool Resize();


@@ -96,11 +93,11 @@ class pkgTagFile
    public:
 
    bool Step(pkgTagSection &Section);
    public:
 
    bool Step(pkgTagSection &Section);

-   inline unsigned long Offset() {return iOffset;};
+   unsigned long Offset();

    bool Jump(pkgTagSection &Tag,unsigned long Offset);
 
    pkgTagFile(FileFd *F,unsigned long Size = 32*1024);
    bool Jump(pkgTagSection &Tag,unsigned long Offset);
 
    pkgTagFile(FileFd *F,unsigned long Size = 32*1024);

-   ~pkgTagFile();
+   virtual ~pkgTagFile();

 };
 
 /* This is the list of things to rewrite. The rewriter
 };
 
 /* This is the list of things to rewrite. The rewriter