merged lp:~mvo/apt/add-missing-dsc-hashes

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

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index f63a51d07843be82fe63a95daf64ff24797e5214..4718f5101171bf68f5e63e11830e0fb8e77b1f44 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -20,19 +20,25 @@
 #ifndef PKGLIB_TAGFILE_H
 #define PKGLIB_TAGFILE_H
 
 #ifndef PKGLIB_TAGFILE_H
 #define PKGLIB_TAGFILE_H
 

+#include <stdio.h>
+
+#include <string>

 
 

+#ifndef APT_8_CLEANER_HEADERS

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/fileutl.h>

-#include <stdio.h>
-    
+#endif
+
+class FileFd;
+

 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 +50,6 @@ class pkgTagSection
       return Res & 0xFF;
    }
 
       return Res & 0xFF;
    }
 

-

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


@@ -54,18 +59,21 @@ class pkgTagSection
    inline bool operator !=(const pkgTagSection &rhs) {return Section != rhs.Section;};
    
    bool Find(const char *Tag,const char *&Start, const char *&End) const;
    inline bool operator !=(const pkgTagSection &rhs) {return Section != rhs.Section;};
    
    bool Find(const char *Tag,const char *&Start, const char *&End) const;

-   bool Find(const char *Tag,unsigned &Pos) const;
-   string FindS(const char *Tag) const;
+   bool Find(const char *Tag,unsigned int &Pos) const;
+   std::string FindS(const char *Tag) const;

    signed int FindI(const char *Tag,signed long Default = 0) 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();
    virtual void TrimRecord(bool BeforeRecord, const char* &End);
    
    inline unsigned int Count() const {return TagCount;};
    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 bool Exists(const char* const Tag) {return AlphaIndexes[AlphaHash(Tag)] != 0;}
+   bool Exists(const char* const Tag);

  
    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];}


@@ -76,18 +84,14 @@ class pkgTagSection
       Stop = this->Stop;
    };
    
       Stop = this->Stop;
    };
    

-   pkgTagSection() : Section(0), Stop(0) {};
+   pkgTagSection() : Section(0), TagCount(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();


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

-   inline unsigned long Offset() {return iOffset;};
-   bool Jump(pkgTagSection &Tag,unsigned long Offset);
+   unsigned long Offset();
+   bool Jump(pkgTagSection &Tag,unsigned long long Offset);

 
 

-   pkgTagFile(FileFd *F,unsigned long Size = 32*1024);
-   ~pkgTagFile();
+   pkgTagFile(FileFd *F,unsigned long long Size = 32*1024);
+   virtual ~pkgTagFile();

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