* merged with mainline

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

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index ea2b0d712c41fbea95ac5957cd8dcd200a078e4d..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.19 2003/04/27 05:59:14 doogie 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


@@ -40,7 +40,6 @@ class pkgTagSection
      
    public:
    
      
    public:
    

-   enum ScanFlags {ScanSuccess=0, ScanError=1, ScanEOF=2};

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


@@ -50,7 +49,7 @@ class pkgTagSection
    signed int FindI(const char *Tag,signed long Default = 0) const ;
    bool FindFlag(const char *Tag,unsigned long &Flags,
                 unsigned long Flag) const;
    signed int FindI(const char *Tag,signed long Default = 0) const ;
    bool FindFlag(const char *Tag,unsigned long &Flags,
                 unsigned long Flag) const;

-   enum ScanFlags Scan(const char *Start,unsigned long MaxLength);
+   bool Scan(const char *Start,unsigned long MaxLength);

    inline unsigned long size() const {return Stop - Section;};
    void Trim();
    
    inline unsigned long size() const {return Stop - Section;};
    void Trim();
    


@@ -76,7 +75,7 @@ class pkgTagFile
    bool Done;
    unsigned long iOffset;
    unsigned long Size;
    bool Done;
    unsigned long iOffset;
    unsigned long Size;

-   unsigned long CurSize; 
+   

    bool Fill();
    
    public:
    bool Fill();
    
    public: