methods/gzip.cc: With FileFd now being able to read gzipped files, there

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

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 8c948754dbb62acdf22232dd1db6103d3ea2f635..321329a2346c49cccb46f0df4bd1ea30da94f379 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -20,9 +20,6 @@
 #ifndef PKGLIB_TAGFILE_H
 #define PKGLIB_TAGFILE_H
 
 #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>
 
 #include <apt-pkg/fileutl.h>
 #include <stdio.h>


@@ -30,14 +27,16 @@
 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;
      

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


@@ -52,6 +51,7 @@ class pkgTagSection
    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 void Get(const char *&Start,const char *&Stop,unsigned int I) const
    
    inline unsigned int Count() const {return TagCount;};
    inline void Get(const char *&Start,const char *&Stop,unsigned int I) const


@@ -75,9 +75,10 @@ class pkgTagFile
    bool Done;
    unsigned long iOffset;
    unsigned long Size;
    bool Done;
    unsigned long iOffset;
    unsigned long Size;

-   
+

    bool Fill();
    bool Fill();

-   
+   bool Resize();
+

    public:
 
    bool Step(pkgTagSection &Section);
    public:
 
    bool Step(pkgTagSection &Section);