merge Goswin Brederlow "support download of index files for different archs"

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

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 948adb4260f15a64ef5f01be25ec8581ad47c5b6..321329a2346c49cccb46f0df4bd1ea30da94f379 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: tagfile.h,v 1.15 2001/02/20 07:03:17 jgg Exp $
+// $Id: tagfile.h,v 1.20 2003/05/19 17:13:57 doogie Exp $
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
@@ -20,9 +20,6 @@
 #ifndef PKGLIB_TAGFILE_H
 #define PKGLIB_TAGFILE_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/tagfile.h"
-#endif 
 
 #include <apt-pkg/fileutl.h>
 #include <stdio.h>
@@ -30,14 +27,16 @@
 class pkgTagSection
 {
    const char *Section;
-   const char *Stop;
    
    // We have a limit of 256 tags per section.
-   unsigned short Indexes[256];
-   unsigned short AlphaIndexes[0xff];
+   unsigned int Indexes[256];
+   unsigned int AlphaIndexes[0x100];
    
    unsigned int TagCount;
      
+   protected:
+   const char *Stop;
+
    public:
    
    inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs.Section;};
@@ -47,11 +46,12 @@ 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 pkgTagSection::FindFlag(const char *Tag,unsigned long &Flags,
-                               unsigned long Flag) const;
+   bool FindFlag(const char *Tag,unsigned long &Flags,
+                unsigned long Flag) const;
    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 void Get(const char *&Start,const char *&Stop,unsigned int I) const
@@ -72,13 +72,13 @@ class pkgTagFile
    char *Buffer;
    char *Start;
    char *End;
-   unsigned long Left;
+   bool Done;
    unsigned long iOffset;
    unsigned long Size;
-   unsigned long TotalSize;
-   
+
    bool Fill();
-   
+   bool Resize();
+
    public:
 
    bool Step(pkgTagSection &Section);