* Applied patch from Daniel Burrows <dburrows@debian.org> to add support

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

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index dd481ba510ea9fe1838ffe278ac1cc962493f293..6536932ddbc4a2a7ded65eacd008fce845d44bf7 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -20,12 +20,8 @@
 #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 <apt-pkg/fileutl.h>

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

 #include <stdio.h>
     
 class pkgTagSection
 #include <stdio.h>
     
 class pkgTagSection


@@ -34,8 +30,8 @@ class pkgTagSection
    const char *Stop;
    
    // We have a limit of 256 tags per section.
    const char *Stop;
    
    // 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;
      


@@ -70,23 +66,23 @@ class pkgTagSection
 class pkgTagFile
 {
    FileFd &Fd;
 class pkgTagFile
 {
    FileFd &Fd;

-   MMap *Map;

    char *Buffer;
    char *Start;
    char *End;
    bool Done;
    unsigned long iOffset;
    unsigned long Size;
    char *Buffer;
    char *Start;
    char *End;
    bool Done;
    unsigned long iOffset;
    unsigned long Size;

-   
+

    bool Fill();
    bool Fill();

-   
+   bool Resize();
+

    public:
 
    bool Step(pkgTagSection &Section);
    inline unsigned long Offset() {return iOffset;};
    bool Jump(pkgTagSection &Tag,unsigned long Offset);
 
    public:
 
    bool Step(pkgTagSection &Section);
    inline unsigned long Offset() {return iOffset;};
    bool Jump(pkgTagSection &Tag,unsigned long Offset);
 

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

    ~pkgTagFile();
 };
 
    ~pkgTagFile();
 };