* merged with mainline

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

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 948adb4260f15a64ef5f01be25ec8581ad47c5b6..8c948754dbb62acdf22232dd1db6103d3ea2f635 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- 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
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information


@@ -34,7 +34,7 @@ class pkgTagSection
    
    // We have a limit of 256 tags per section.
    unsigned short Indexes[256];
    
    // We have a limit of 256 tags per section.
    unsigned short Indexes[256];

-   unsigned short AlphaIndexes[0xff];
+   unsigned short AlphaIndexes[0x100];

    
    unsigned int TagCount;
      
    
    unsigned int TagCount;
      


@@ -47,8 +47,8 @@ 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 ;

-   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();
    bool Scan(const char *Start,unsigned long MaxLength);
    inline unsigned long size() const {return Stop - Section;};
    void Trim();


@@ -72,10 +72,9 @@ class pkgTagFile
    char *Buffer;
    char *Start;
    char *End;
    char *Buffer;
    char *Start;
    char *End;

-   unsigned long Left;
+   bool Done;

    unsigned long iOffset;
    unsigned long Size;
    unsigned long iOffset;
    unsigned long Size;

-   unsigned long TotalSize;

    
    bool Fill();
    
    
    bool Fill();