cleanup datatypes mix used in binary cache

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

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 7e32a3a9692818e2e411272c8ab2e5fd0c3f2247..f57c31b98bdb1bd55a570f0e283bb3b9bbcb99fd 100644 (file)
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -74,10 +74,27 @@
 #ifndef PKGLIB_PKGCACHE_H
 #define PKGLIB_PKGCACHE_H
 
 #ifndef PKGLIB_PKGCACHE_H
 #define PKGLIB_PKGCACHE_H
 

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

 
 #include <string>
 #include <time.h>
 
 #include <string>
 #include <time.h>

-#include <apt-pkg/mmap.h>
+#include <stdint.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+
+// storing file sizes of indexes, which are way below 4 GB for now
+typedef uint32_t map_filesize_t;
+// each package/group/dependency gets an id
+typedef uint32_t map_id_t;
+// some files get an id, too, but in far less absolute numbers
+typedef uint16_t map_fileid_t;
+// relative pointer from cache start
+typedef uint32_t map_pointer_t;
+// same as the previous, but documented to be to a string item
+typedef map_pointer_t map_stringitem_t;

 
 class pkgVersioningSystem;
 class pkgCache                                                         /*{{{*/
 
 class pkgVersioningSystem;
 class pkgCache                                                         /*{{{*/


@@ -133,7 +150,7 @@ class pkgCache                                                              /*{{{*/
       /** \brief priority of a package version
 
           Zero is used for unparsable or absent Priority fields. */
       /** \brief priority of a package version
 
           Zero is used for unparsable or absent Priority fields. */

-      enum VerPriority {Important=1,Required=2,Standard=3,Optional=4,Extra=5};
+      enum VerPriority {Required=1,Important=2,Standard=3,Optional=4,Extra=5};

       enum PkgSelectedState {Unknown=0,Install=1,Hold=2,DeInstall=3,Purge=4};
       enum PkgInstState {Ok=0,ReInstReq=1,HoldInst=2,HoldReInstReq=3};
       enum PkgCurrentState {NotInstalled=0,UnPacked=1,HalfConfigured=2,
       enum PkgSelectedState {Unknown=0,Install=1,Hold=2,DeInstall=3,Purge=4};
       enum PkgInstState {Ok=0,ReInstReq=1,HoldInst=2,HoldReInstReq=3};
       enum PkgCurrentState {NotInstalled=0,UnPacked=1,HalfConfigured=2,


@@ -153,8 +170,8 @@ class pkgCache                                                              /*{{{*/
    std::string CacheFile;
    MMap &Map;
 
    std::string CacheFile;
    MMap &Map;
 

-   unsigned long sHash(const std::string &S) const;
-   unsigned long sHash(const char *S) const;
+   map_id_t sHash(const std::string &S) const APT_PURE;
+   map_id_t sHash(const char *S) const APT_PURE;

    
    public:
    
    
    public:
    


@@ -173,13 +190,13 @@ class pkgCache                                                            /*{{{*/
    char *StrP;
 
    virtual bool ReMap(bool const &Errorchecks = true);
    char *StrP;
 
    virtual bool ReMap(bool const &Errorchecks = true);

-   inline bool Sync() {return Map.Sync();};
-   inline MMap &GetMap() {return Map;};
-   inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();};
+   inline bool Sync() {return Map.Sync();}
+   inline MMap &GetMap() {return Map;}
+   inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();}

       
    // String hashing function (512 range)
       
    // String hashing function (512 range)

-   inline unsigned long Hash(const std::string &S) const {return sHash(S);};
-   inline unsigned long Hash(const char *S) const {return sHash(S);};
+   inline map_id_t Hash(const std::string &S) const {return sHash(S);}
+   inline map_id_t Hash(const char *S) const {return sHash(S);}

 
    // Useful transformation things
    const char *Priority(unsigned char Priority);
 
    // Useful transformation things
    const char *Priority(unsigned char Priority);


@@ -189,7 +206,7 @@ class pkgCache                                                              /*{{{*/
    PkgIterator FindPkg(const std::string &Name);
    PkgIterator FindPkg(const std::string &Name, const std::string &Arch);
 
    PkgIterator FindPkg(const std::string &Name);
    PkgIterator FindPkg(const std::string &Name, const std::string &Arch);
 

-   Header &Head() {return *HeaderP;};
+   Header &Head() {return *HeaderP;}

    inline GrpIterator GrpBegin();
    inline GrpIterator GrpEnd();
    inline PkgIterator PkgBegin();
    inline GrpIterator GrpBegin();
    inline GrpIterator GrpEnd();
    inline PkgIterator PkgBegin();


@@ -197,23 +214,23 @@ class pkgCache                                                            /*{{{*/
    inline PkgFileIterator FileBegin();
    inline PkgFileIterator FileEnd();
 
    inline PkgFileIterator FileBegin();
    inline PkgFileIterator FileEnd();
 

-   inline bool MultiArchCache() const { return MultiArchEnabled; };
+   inline bool MultiArchCache() const { return MultiArchEnabled; }
+   inline char const * NativeArch();

 
    // Make me a function
    pkgVersioningSystem *VS;
    
    // Converters
 
    // Make me a function
    pkgVersioningSystem *VS;
    
    // Converters

-   static const char *CompTypeDeb(unsigned char Comp);
-   static const char *CompType(unsigned char Comp);
+   static const char *CompTypeDeb(unsigned char Comp) APT_CONST;
+   static const char *CompType(unsigned char Comp) APT_CONST;

    static const char *DepType(unsigned char Dep);
    
    pkgCache(MMap *Map,bool DoMap = true);
    static const char *DepType(unsigned char Dep);
    
    pkgCache(MMap *Map,bool DoMap = true);

-   virtual ~pkgCache() {};
+   virtual ~pkgCache() {}

 
 private:
    bool MultiArchEnabled;
    PkgIterator SingleArchFindPkg(const std::string &Name);
 
 private:
    bool MultiArchEnabled;
    PkgIterator SingleArchFindPkg(const std::string &Name);

-   inline char const * const NativeArch() const;

 };
                                                                        /*}}}*/
 // Header structure                                                    /*{{{*/
 };
                                                                        /*}}}*/
 // Header structure                                                    /*{{{*/


@@ -258,35 +275,37 @@ struct pkgCache::Header
        These indicate the number of each structure contained in the cache.
        PackageCount is especially useful for generating user state structures.
        See Package::Id for more info. */
        These indicate the number of each structure contained in the cache.
        PackageCount is especially useful for generating user state structures.
        See Package::Id for more info. */

-   unsigned long GroupCount;
-   unsigned long PackageCount;
-   unsigned long VersionCount;
-   unsigned long DescriptionCount;
-   unsigned long DependsCount;
-   unsigned long PackageFileCount;
-   unsigned long VerFileCount;
-   unsigned long DescFileCount;
-   unsigned long ProvidesCount;
+   map_id_t GroupCount;
+   map_id_t PackageCount;
+   map_id_t VersionCount;
+   map_id_t DescriptionCount;
+   map_id_t DependsCount;
+   map_fileid_t PackageFileCount;
+   map_fileid_t VerFileCount;
+   map_fileid_t DescFileCount;
+   map_id_t ProvidesCount;

 
    /** \brief index of the first PackageFile structure
 
        The PackageFile structures are singly linked lists that represent
        all package files that have been merged into the cache. */
 
    /** \brief index of the first PackageFile structure
 
        The PackageFile structures are singly linked lists that represent
        all package files that have been merged into the cache. */

-   map_ptrloc FileList;
+   map_pointer_t FileList;

    /** \brief index of the first StringItem structure
 
        The cache contains a list of all the unique strings (StringItems).
        The parser reads this list into memory so it can match strings
        against it.*/
    /** \brief index of the first StringItem structure
 
        The cache contains a list of all the unique strings (StringItems).
        The parser reads this list into memory so it can match strings
        against it.*/

-   map_ptrloc StringList;
+   map_pointer_t StringList;

    /** \brief String representing the version system used */
    /** \brief String representing the version system used */

-   map_ptrloc VerSysName;
-   /** \brief Architecture(s) the cache was built against */
-   map_ptrloc Architecture;
+   map_pointer_t VerSysName;
+   /** \brief native architecture the cache was built against */
+   map_pointer_t Architecture;
+   /** \brief all architectures the cache was built against */
+   map_pointer_t Architectures;

    /** \brief The maximum size of a raw entry from the original Package file */
    /** \brief The maximum size of a raw entry from the original Package file */

-   unsigned long MaxVerFileSize;
+   map_filesize_t MaxVerFileSize;

    /** \brief The maximum size of a raw entry from the original Translation file */
    /** \brief The maximum size of a raw entry from the original Translation file */

-   unsigned long MaxDescFileSize;
+   map_filesize_t MaxDescFileSize;

 
    /** \brief The Pool structures manage the allocation pools that the generator uses
 
 
    /** \brief The Pool structures manage the allocation pools that the generator uses
 


@@ -297,25 +316,25 @@ struct pkgCache::Header
        stores this information so future additions can make use of any unused pool
        blocks. */
    DynamicMMap::Pool Pools[9];
        stores this information so future additions can make use of any unused pool
        blocks. */
    DynamicMMap::Pool Pools[9];

-   
+

    /** \brief hash tables providing rapid group/package name lookup
 
    /** \brief hash tables providing rapid group/package name lookup
 

-       Each group/package name is inserted into the hash table using pkgCache::Hash(const &string)
+       Each group/package name is inserted into a hash table using pkgCache::Hash(const &string)

        By iterating over each entry in the hash table it is possible to iterate over
        the entire list of packages. Hash Collisions are handled with a singly linked
        list of packages based at the hash item. The linked list contains only
        packages that match the hashing function.
        In the PkgHashTable is it possible that multiple packages have the same name -
        these packages are stored as a sequence in the list.
        By iterating over each entry in the hash table it is possible to iterate over
        the entire list of packages. Hash Collisions are handled with a singly linked
        list of packages based at the hash item. The linked list contains only
        packages that match the hashing function.
        In the PkgHashTable is it possible that multiple packages have the same name -
        these packages are stored as a sequence in the list.

-
-       Beware: The Hashmethod assumes that the hash table sizes are equal */
-   map_ptrloc PkgHashTable[2*1048];
-   map_ptrloc GrpHashTable[2*1048];
+       The size of both tables is the same. */
+   unsigned int HashTableSize;
+   map_pointer_t * PkgHashTable() const { return (map_pointer_t*) (this + 1); }
+   map_pointer_t * GrpHashTable() const { return PkgHashTable() + HashTableSize; }

 
    /** \brief Size of the complete cache file */
 
    /** \brief Size of the complete cache file */

-   unsigned long  CacheFileSize;
+   unsigned long long CacheFileSize;

 
 

-   bool CheckSizes(Header &Against) const;
+   bool CheckSizes(Header &Against) const APT_PURE;

    Header();
 };
                                                                        /*}}}*/
    Header();
 };
                                                                        /*}}}*/


@@ -329,17 +348,17 @@ struct pkgCache::Header
 struct pkgCache::Group
 {
    /** \brief Name of the group */
 struct pkgCache::Group
 {
    /** \brief Name of the group */

-   map_ptrloc Name;            // StringItem
+   map_stringitem_t Name;

 
    // Linked List
    /** \brief Link to the first package which belongs to the group */
 
    // Linked List
    /** \brief Link to the first package which belongs to the group */

-   map_ptrloc FirstPackage;    // Package
+   map_pointer_t FirstPackage; // Package

    /** \brief Link to the last package which belongs to the group */
    /** \brief Link to the last package which belongs to the group */

-   map_ptrloc LastPackage;     // Package
+   map_pointer_t LastPackage;  // Package

    /** \brief Link to the next Group */
    /** \brief Link to the next Group */

-   map_ptrloc Next;            // Group
+   map_pointer_t Next;         // Group

    /** \brief unique sequel ID */
    /** \brief unique sequel ID */

-   unsigned int ID;
+   map_id_t ID;

 
 };
                                                                        /*}}}*/
 
 };
                                                                        /*}}}*/


@@ -351,16 +370,16 @@ struct pkgCache::Group
     the hash index of the name in the pkgCache::Header::PkgHashTable
 
     A package can be created for every architecture so package names are
     the hash index of the name in the pkgCache::Header::PkgHashTable
 
     A package can be created for every architecture so package names are

-    not unique, but it is garanteed that packages with the same name
+    not unique, but it is guaranteed that packages with the same name

     are sequencel ordered in the list. Packages with the same name can be
     accessed with the Group.
 */
 struct pkgCache::Package
 {
    /** \brief Name of the package */
     are sequencel ordered in the list. Packages with the same name can be
     accessed with the Group.
 */
 struct pkgCache::Package
 {
    /** \brief Name of the package */

-   map_ptrloc Name;              // StringItem
+   map_stringitem_t Name;

    /** \brief Architecture of the package */
    /** \brief Architecture of the package */

-   map_ptrloc Arch;              // StringItem
+   map_stringitem_t Arch;

    /** \brief Base of a singly linked list of versions
 
        Each structure represents a unique version of the package.
    /** \brief Base of a singly linked list of versions
 
        Each structure represents a unique version of the package.


@@ -370,24 +389,24 @@ struct pkgCache::Package
        versions of a package can be cleanly handled by the system.
        Furthermore, this linked list is guaranteed to be sorted
        from Highest version to lowest version with no duplicate entries. */
        versions of a package can be cleanly handled by the system.
        Furthermore, this linked list is guaranteed to be sorted
        from Highest version to lowest version with no duplicate entries. */

-   map_ptrloc VersionList;       // Version
+   map_pointer_t VersionList;       // Version

    /** \brief index to the installed version */
    /** \brief index to the installed version */

-   map_ptrloc CurrentVer;        // Version
+   map_pointer_t CurrentVer;        // Version

    /** \brief indicates the deduced section
 
        Should be the index to the string "Unknown" or to the section
        of the last parsed item. */
    /** \brief indicates the deduced section
 
        Should be the index to the string "Unknown" or to the section
        of the last parsed item. */

-   map_ptrloc Section;           // StringItem
+   map_stringitem_t Section;

    /** \brief index of the group this package belongs to */
    /** \brief index of the group this package belongs to */

-   map_ptrloc Group;             // Group the Package belongs to
+   map_pointer_t Group;             // Group the Package belongs to

 
    // Linked list
    /** \brief Link to the next package in the same bucket */
 
    // Linked list
    /** \brief Link to the next package in the same bucket */

-   map_ptrloc NextPackage;       // Package
+   map_pointer_t Next;       // Package

    /** \brief List of all dependencies on this package */
    /** \brief List of all dependencies on this package */

-   map_ptrloc RevDepends;        // Dependency
+   map_pointer_t RevDepends;        // Dependency

    /** \brief List of all "packages" this package provide */
    /** \brief List of all "packages" this package provide */

-   map_ptrloc ProvidesList;      // Provides
+   map_pointer_t ProvidesList;      // Provides

 
    // Install/Remove/Purge etc
    /** \brief state that the user wishes the package to be in */
 
    // Install/Remove/Purge etc
    /** \brief state that the user wishes the package to be in */


@@ -407,7 +426,7 @@ struct pkgCache::Package
        This allows clients to create an array of size PackageCount and use it to store
        state information for the package map. For instance the status file emitter uses
        this to track which packages have been emitted already. */
        This allows clients to create an array of size PackageCount and use it to store
        state information for the package map. For instance the status file emitter uses
        this to track which packages have been emitted already. */

-   unsigned int ID;
+   map_id_t ID;

    /** \brief some useful indicators of the package's state */
    unsigned long Flags;
 };
    /** \brief some useful indicators of the package's state */
    unsigned long Flags;
 };


@@ -421,41 +440,41 @@ struct pkgCache::Package
 struct pkgCache::PackageFile
 {
    /** \brief physical disk file that this PackageFile represents */
 struct pkgCache::PackageFile
 {
    /** \brief physical disk file that this PackageFile represents */

-   map_ptrloc FileName;        // StringItem
+   map_pointer_t FileName;        // StringItem

    /** \brief the release information
 
        Please see the files document for a description of what the
        release information means. */
    /** \brief the release information
 
        Please see the files document for a description of what the
        release information means. */

-   map_ptrloc Archive;         // StringItem
-   map_ptrloc Codename;        // StringItem
-   map_ptrloc Component;       // StringItem
-   map_ptrloc Version;         // StringItem
-   map_ptrloc Origin;          // StringItem
-   map_ptrloc Label;           // StringItem
-   map_ptrloc Architecture;    // StringItem
+   map_stringitem_t Archive;
+   map_stringitem_t Codename;
+   map_stringitem_t Component;
+   map_stringitem_t Version;
+   map_stringitem_t Origin;
+   map_stringitem_t Label;
+   map_stringitem_t Architecture;

    /** \brief The site the index file was fetched from */
    /** \brief The site the index file was fetched from */

-   map_ptrloc Site;            // StringItem
+   map_stringitem_t Site;

    /** \brief indicates what sort of index file this is
 
        @TODO enumerate at least the possible indexes */
    /** \brief indicates what sort of index file this is
 
        @TODO enumerate at least the possible indexes */

-   map_ptrloc IndexType;       // StringItem
+   map_stringitem_t IndexType;

    /** \brief Size of the file
 
        Used together with the modification time as a
        simple check to ensure that the Packages
        file has not been altered since Cache generation. */
    /** \brief Size of the file
 
        Used together with the modification time as a
        simple check to ensure that the Packages
        file has not been altered since Cache generation. */

-   unsigned long Size;
+   map_filesize_t Size;

    /** \brief Modification time for the file */
    time_t mtime;
 
    /** \brief Modification time for the file */
    time_t mtime;
 

-   /* @TODO document PackageFile::Flags */
+   /** @TODO document PackageFile::Flags */

    unsigned long Flags;
 
    // Linked list
    /** \brief Link to the next PackageFile in the Cache */
    unsigned long Flags;
 
    // Linked list
    /** \brief Link to the next PackageFile in the Cache */

-   map_ptrloc NextFile;        // PackageFile
+   map_pointer_t NextFile;        // PackageFile

    /** \brief unique sequel ID */
    /** \brief unique sequel ID */

-   unsigned int ID;
+   map_fileid_t ID;

 };
                                                                        /*}}}*/
 // VerFile structure                                                   /*{{{*/
 };
                                                                        /*}}}*/
 // VerFile structure                                                   /*{{{*/


@@ -466,13 +485,13 @@ struct pkgCache::PackageFile
 struct pkgCache::VerFile
 {
    /** \brief index of the package file that this version was found in */
 struct pkgCache::VerFile
 {
    /** \brief index of the package file that this version was found in */

-   map_ptrloc File;           // PackageFile
+   map_pointer_t File;           // PackageFile

    /** \brief next step in the linked list */
    /** \brief next step in the linked list */

-   map_ptrloc NextFile;       // PkgVerFile
+   map_pointer_t NextFile;       // PkgVerFile

    /** \brief position in the package file */
    /** \brief position in the package file */

-   map_ptrloc Offset;         // File offset
-   /* @TODO document pkgCache::VerFile::Size */
-   unsigned long Size;
+   map_filesize_t Offset;         // File offset
+   /** @TODO document pkgCache::VerFile::Size */
+   map_filesize_t Size;

 };
                                                                        /*}}}*/
 // DescFile structure                                                  /*{{{*/
 };
                                                                        /*}}}*/
 // DescFile structure                                                  /*{{{*/


@@ -480,13 +499,13 @@ struct pkgCache::VerFile
 struct pkgCache::DescFile
 {
    /** \brief index of the file that this description was found in */
 struct pkgCache::DescFile
 {
    /** \brief index of the file that this description was found in */

-   map_ptrloc File;           // PackageFile
+   map_pointer_t File;           // PackageFile

    /** \brief next step in the linked list */
    /** \brief next step in the linked list */

-   map_ptrloc NextFile;       // PkgVerFile
+   map_pointer_t NextFile;       // PkgVerFile

    /** \brief position in the file */
    /** \brief position in the file */

-   map_ptrloc Offset;         // File offset
-   /* @TODO document pkgCache::DescFile::Size */
-   unsigned long Size;
+   map_filesize_t Offset;         // File offset
+   /** @TODO document pkgCache::DescFile::Size */
+   map_filesize_t Size;

 };
                                                                        /*}}}*/
 // Version structure                                                   /*{{{*/
 };
                                                                        /*}}}*/
 // Version structure                                                   /*{{{*/


@@ -498,9 +517,9 @@ struct pkgCache::DescFile
 struct pkgCache::Version
 {
    /** \brief complete version string */
 struct pkgCache::Version
 {
    /** \brief complete version string */

-   map_ptrloc VerStr;            // StringItem
+   map_stringitem_t VerStr;

    /** \brief section this version is filled in */
    /** \brief section this version is filled in */

-   map_ptrloc Section;           // StringItem
+   map_stringitem_t Section;

 
    /** \brief Multi-Arch capabilities of a package version */
    enum VerMultiArch { None = 0, /*!< is the default and doesn't trigger special behaviour */
 
    /** \brief Multi-Arch capabilities of a package version */
    enum VerMultiArch { None = 0, /*!< is the default and doesn't trigger special behaviour */


@@ -522,33 +541,33 @@ struct pkgCache::Version
        applies to. If FileList is 0 then this is a blank version.
        The structure should also have a 0 in all other fields excluding
        pkgCache::Version::VerStr and Possibly pkgCache::Version::NextVer. */
        applies to. If FileList is 0 then this is a blank version.
        The structure should also have a 0 in all other fields excluding
        pkgCache::Version::VerStr and Possibly pkgCache::Version::NextVer. */

-   map_ptrloc FileList;          // VerFile
+   map_pointer_t FileList;          // VerFile

    /** \brief next (lower or equal) version in the linked list */
    /** \brief next (lower or equal) version in the linked list */

-   map_ptrloc NextVer;           // Version
+   map_pointer_t NextVer;           // Version

    /** \brief next description in the linked list */
    /** \brief next description in the linked list */

-   map_ptrloc DescriptionList;   // Description
+   map_pointer_t DescriptionList;   // Description

    /** \brief base of the dependency list */
    /** \brief base of the dependency list */

-   map_ptrloc DependsList;       // Dependency
+   map_pointer_t DependsList;       // Dependency

    /** \brief links to the owning package
 
        This allows reverse dependencies to determine the package */
    /** \brief links to the owning package
 
        This allows reverse dependencies to determine the package */

-   map_ptrloc ParentPkg;         // Package
+   map_pointer_t ParentPkg;         // Package

    /** \brief list of pkgCache::Provides */
    /** \brief list of pkgCache::Provides */

-   map_ptrloc ProvidesList;      // Provides
+   map_pointer_t ProvidesList;      // Provides

 
    /** \brief archive size for this version
 
        For Debian this is the size of the .deb file. */
 
    /** \brief archive size for this version
 
        For Debian this is the size of the .deb file. */

-   unsigned long long Size;      // These are the .deb size
+   uint64_t Size; // These are the .deb size

    /** \brief uncompressed size for this version */
    /** \brief uncompressed size for this version */

-   unsigned long long InstalledSize;
+   uint64_t InstalledSize;

    /** \brief characteristic value representing this version
 
        No two packages in existence should have the same VerStr
        and Hash with different contents. */
    unsigned short Hash;
    /** \brief unique sequel ID */
    /** \brief characteristic value representing this version
 
        No two packages in existence should have the same VerStr
        and Hash with different contents. */
    unsigned short Hash;
    /** \brief unique sequel ID */

-   unsigned int ID;
+   map_id_t ID;

    /** \brief parsed priority value */
    unsigned char Priority;
 };
    /** \brief parsed priority value */
    unsigned char Priority;
 };


@@ -561,22 +580,22 @@ struct pkgCache::Description
 
        If the value has a 0 length then this is read using the Package
        file else the Translation-CODE file is used. */
 
        If the value has a 0 length then this is read using the Package
        file else the Translation-CODE file is used. */

-   map_ptrloc language_code;     // StringItem
+   map_stringitem_t language_code;

    /** \brief MD5sum of the original description
 
        Used to map Translations of a description to a version
        and to check that the Translation is up-to-date. */
    /** \brief MD5sum of the original description
 
        Used to map Translations of a description to a version
        and to check that the Translation is up-to-date. */

-   map_ptrloc md5sum;            // StringItem
+   map_stringitem_t md5sum;

 
 

-   /* @TODO document pkgCache::Description::FileList */
-   map_ptrloc FileList;          // DescFile
+   /** @TODO document pkgCache::Description::FileList */
+   map_pointer_t FileList;          // DescFile

    /** \brief next translation for this description */
    /** \brief next translation for this description */

-   map_ptrloc NextDesc;          // Description
+   map_pointer_t NextDesc;          // Description

    /** \brief the text is a description of this package */
    /** \brief the text is a description of this package */

-   map_ptrloc ParentPkg;         // Package
+   map_pointer_t ParentPkg;         // Package

 
    /** \brief unique sequel ID */
 
    /** \brief unique sequel ID */

-   unsigned int ID;
+   map_id_t ID;

 };
                                                                        /*}}}*/
 // Dependency structure                                                        /*{{{*/
 };
                                                                        /*}}}*/
 // Dependency structure                                                        /*{{{*/


@@ -589,21 +608,21 @@ struct pkgCache::Description
 struct pkgCache::Dependency
 {
    /** \brief string of the version the dependency is applied against */
 struct pkgCache::Dependency
 {
    /** \brief string of the version the dependency is applied against */

-   map_ptrloc Version;         // StringItem
+   map_stringitem_t Version;         // StringItem

    /** \brief index of the package this depends applies to
 
        The generator will - if the package does not already exist -
        create a blank (no version records) package. */
    /** \brief index of the package this depends applies to
 
        The generator will - if the package does not already exist -
        create a blank (no version records) package. */

-   map_ptrloc Package;         // Package
+   map_pointer_t Package;         // Package

    /** \brief next dependency of this version */
    /** \brief next dependency of this version */

-   map_ptrloc NextDepends;     // Dependency
+   map_pointer_t NextDepends;     // Dependency

    /** \brief next reverse dependency of this package */
    /** \brief next reverse dependency of this package */

-   map_ptrloc NextRevDepends;  // Dependency
+   map_pointer_t NextRevDepends;  // Dependency

    /** \brief version of the package which has the reverse depends */
    /** \brief version of the package which has the reverse depends */

-   map_ptrloc ParentVer;       // Version
+   map_pointer_t ParentVer;       // Version

 
    /** \brief unique sequel ID */
 
    /** \brief unique sequel ID */

-   map_ptrloc ID;
+   map_id_t ID;

    /** \brief Dependency type - Depends, Recommends, Conflicts, etc */
    unsigned char Type;
    /** \brief comparison operator specified on the depends line
    /** \brief Dependency type - Depends, Recommends, Conflicts, etc */
    unsigned char Type;
    /** \brief comparison operator specified on the depends line


@@ -624,19 +643,19 @@ struct pkgCache::Dependency
 struct pkgCache::Provides
 {
    /** \brief index of the package providing this */
 struct pkgCache::Provides
 {
    /** \brief index of the package providing this */

-   map_ptrloc ParentPkg;        // Package
+   map_pointer_t ParentPkg;        // Package

    /** \brief index of the version this provide line applies to */
    /** \brief index of the version this provide line applies to */

-   map_ptrloc Version;          // Version
+   map_pointer_t Version;          // Version

    /** \brief version in the provides line (if any)
 
        This version allows dependencies to depend on specific versions of a
        Provides, as well as allowing Provides to override existing packages.
        This is experimental. Note that Debian doesn't allow versioned provides */
    /** \brief version in the provides line (if any)
 
        This version allows dependencies to depend on specific versions of a
        Provides, as well as allowing Provides to override existing packages.
        This is experimental. Note that Debian doesn't allow versioned provides */

-   map_ptrloc ProvideVersion;   // StringItem
+   map_stringitem_t ProvideVersion;

    /** \brief next provides (based of package) */
    /** \brief next provides (based of package) */

-   map_ptrloc NextProvides;     // Provides
+   map_pointer_t NextProvides;     // Provides

    /** \brief next provides (based of version) */
    /** \brief next provides (based of version) */

-   map_ptrloc NextPkgProv;      // Provides
+   map_pointer_t NextPkgProv;      // Provides

 };
                                                                        /*}}}*/
 // StringItem structure                                                        /*{{{*/
 };
                                                                        /*}}}*/
 // StringItem structure                                                        /*{{{*/


@@ -651,34 +670,34 @@ struct pkgCache::Provides
 struct pkgCache::StringItem
 {
    /** \brief string this refers to */
 struct pkgCache::StringItem
 {
    /** \brief string this refers to */

-   map_ptrloc String;        // StringItem
+   map_stringitem_t String;

    /** \brief Next link in the chain */
    /** \brief Next link in the chain */

-   map_ptrloc NextItem;      // StringItem
+   map_stringitem_t NextItem;

 };
                                                                        /*}}}*/
 
 
 };
                                                                        /*}}}*/
 
 

-inline char const * const pkgCache::NativeArch() const
-       { return StrP + HeaderP->Architecture; };
+inline char const * pkgCache::NativeArch()
+       { return StrP + HeaderP->Architecture; }

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

-inline pkgCache::GrpIterator pkgCache::GrpBegin() 
-       {return GrpIterator(*this);};
-inline pkgCache::GrpIterator pkgCache::GrpEnd() 
-       {return GrpIterator(*this,GrpP);};
-inline pkgCache::PkgIterator pkgCache::PkgBegin() 
-       {return PkgIterator(*this);};
-inline pkgCache::PkgIterator pkgCache::PkgEnd() 
-       {return PkgIterator(*this,PkgP);};
+inline pkgCache::GrpIterator pkgCache::GrpBegin()
+       {return GrpIterator(*this);}
+inline pkgCache::GrpIterator pkgCache::GrpEnd()
+       {return GrpIterator(*this,GrpP);}
+inline pkgCache::PkgIterator pkgCache::PkgBegin()
+       {return PkgIterator(*this);}
+inline pkgCache::PkgIterator pkgCache::PkgEnd()
+       {return PkgIterator(*this,PkgP);}

 inline pkgCache::PkgFileIterator pkgCache::FileBegin()
 inline pkgCache::PkgFileIterator pkgCache::FileBegin()

-       {return PkgFileIterator(*this,PkgFileP + HeaderP->FileList);};
+       {return PkgFileIterator(*this,PkgFileP + HeaderP->FileList);}

 inline pkgCache::PkgFileIterator pkgCache::FileEnd()
 inline pkgCache::PkgFileIterator pkgCache::FileEnd()

-       {return PkgFileIterator(*this,PkgFileP);};
+       {return PkgFileIterator(*this,PkgFileP);}

 
 // Oh I wish for Real Name Space Support
 class pkgCache::Namespace                                              /*{{{*/
 
 // Oh I wish for Real Name Space Support
 class pkgCache::Namespace                                              /*{{{*/

-{   
+{

    public:
    typedef pkgCache::GrpIterator GrpIterator;
    typedef pkgCache::PkgIterator PkgIterator;
    public:
    typedef pkgCache::GrpIterator GrpIterator;
    typedef pkgCache::PkgIterator PkgIterator;


@@ -687,7 +706,7 @@ class pkgCache::Namespace                                           /*{{{*/
    typedef pkgCache::DepIterator DepIterator;
    typedef pkgCache::PrvIterator PrvIterator;
    typedef pkgCache::PkgFileIterator PkgFileIterator;
    typedef pkgCache::DepIterator DepIterator;
    typedef pkgCache::PrvIterator PrvIterator;
    typedef pkgCache::PkgFileIterator PkgFileIterator;

-   typedef pkgCache::VerFileIterator VerFileIterator;   
+   typedef pkgCache::VerFileIterator VerFileIterator;

    typedef pkgCache::Version Version;
    typedef pkgCache::Description Description;
    typedef pkgCache::Package Package;
    typedef pkgCache::Version Version;
    typedef pkgCache::Description Description;
    typedef pkgCache::Package Package;