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 05c6aa7016372492eb55ea65042149b74621a46d..23f5c57e6df33361df220bea05dd40610a98b483 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -23,18 +23,30 @@
 
 #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;

-   const char *Stop;
-   

    // We have a limit of 256 tags per section.
    // We have a limit of 256 tags per section.

-   unsigned short Indexes[256];
-   unsigned short AlphaIndexes[0x100];
-   
+   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 */
+   inline static unsigned long AlphaHash(const char *Text, const char *End = 0)
+   {
+      unsigned long Res = 0;
+      for (; Text != End && *Text != ':' && *Text != 0; Text++)
+        Res = ((unsigned long)(*Text) & 0xDF) ^ (Res << 1);
+      return Res & 0xFF;
+   }
+
+   protected:
+   const char *Stop;
+

    public:
    
    inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs.Section;};
    public:
    
    inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs.Section;};


@@ -44,13 +56,19 @@ class pkgTagSection
    bool Find(const char *Tag,unsigned &Pos) const;
    string FindS(const char *Tag) const;
    signed int FindI(const char *Tag,signed long Default = 0) const ;
    bool Find(const char *Tag,unsigned &Pos) const;
    string FindS(const char *Tag) const;
    signed int FindI(const char *Tag,signed long Default = 0) 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 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();

+   virtual void TrimRecord(bool BeforeRecord, const char* &End);

    
    inline unsigned int Count() const {return TagCount;};
    
    inline unsigned int Count() const {return TagCount;};

+   inline bool Exists(const char* const Tag) {return AlphaIndexes[AlphaHash(Tag)] != 0;}
+ 

    inline void Get(const char *&Start,const char *&Stop,unsigned int I) const
                    {Start = Section + Indexes[I]; Stop = Section + Indexes[I+1];}
            
    inline void Get(const char *&Start,const char *&Stop,unsigned int I) const
                    {Start = Section + Indexes[I]; Stop = Section + Indexes[I+1];}
            


@@ -61,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();


@@ -79,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