X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/a52f938bcf7f31d348c6ce1d462a8ce14a38b8cc..a4decc40b3eb085ea994d2a8b31ee9cddfd570ff:/apt-pkg/pkgcache.h?ds=inline diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 6a54ad5ba..587d97534 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -38,30 +38,24 @@ class pkgCache struct Package; struct PackageFile; struct Version; - struct Description; struct Provides; struct Dependency; struct StringItem; struct VerFile; - struct DescFile; // Iterators class PkgIterator; class VerIterator; - class DescIterator; class DepIterator; class PrvIterator; class PkgFileIterator; class VerFileIterator; - class DescFileIterator; friend class PkgIterator; friend class VerIterator; - friend class DescInterator; friend class DepIterator; friend class PrvIterator; friend class PkgFileIterator; friend class VerFileIterator; - friend class DescFileIterator; class Namespace; @@ -95,7 +89,7 @@ class pkgCache string CacheFile; MMap ⤅ - unsigned long sHash(string S) const; + unsigned long sHash(const string &S) const; unsigned long sHash(const char *S) const; public: @@ -104,10 +98,8 @@ class pkgCache Header *HeaderP; Package *PkgP; VerFile *VerFileP; - DescFile *DescFileP; PackageFile *PkgFileP; Version *VerP; - Description *DescP; Provides *ProvideP; Dependency *DepP; StringItem *StringItemP; @@ -119,14 +111,14 @@ class pkgCache inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();}; // String hashing function (512 range) - inline unsigned long Hash(string S) const {return sHash(S);}; + inline unsigned long Hash(const string &S) const {return sHash(S);}; inline unsigned long Hash(const char *S) const {return sHash(S);}; // Usefull transformation things const char *Priority(unsigned char Priority); // Accessors - PkgIterator FindPkg(string Name); + PkgIterator FindPkg(const string &Name); Header &Head() {return *HeaderP;}; inline PkgIterator PkgBegin(); inline PkgIterator PkgEnd(); @@ -159,20 +151,16 @@ struct pkgCache::Header unsigned short PackageSz; unsigned short PackageFileSz; unsigned short VersionSz; - unsigned short DescriptionSz; unsigned short DependencySz; unsigned short ProvidesSz; unsigned short VerFileSz; - unsigned short DescFileSz; // Structure counts unsigned long PackageCount; unsigned long VersionCount; - unsigned long DescriptionCount; unsigned long DependsCount; unsigned long PackageFileCount; unsigned long VerFileCount; - unsigned long DescFileCount; unsigned long ProvidesCount; // Offsets @@ -181,11 +169,10 @@ struct pkgCache::Header map_ptrloc VerSysName; // StringTable map_ptrloc Architecture; // StringTable unsigned long MaxVerFileSize; - unsigned long MaxDescFileSize; /* Allocation pools, there should be one of these for each structure excluding the header */ - DynamicMMap::Pool Pools[8]; + DynamicMMap::Pool Pools[7]; // Rapid package name lookup map_ptrloc HashTable[2*1048]; @@ -206,7 +193,7 @@ struct pkgCache::Package map_ptrloc NextPackage; // Package map_ptrloc RevDepends; // Dependency map_ptrloc ProvidesList; // Provides - + // Install/Remove/Purge etc unsigned char SelectedState; // What unsigned char InstState; // Flags @@ -245,14 +232,6 @@ struct pkgCache::VerFile unsigned short Size; }; -struct pkgCache::DescFile -{ - map_ptrloc File; // PackageFile - map_ptrloc NextFile; // PkgVerFile - map_ptrloc Offset; // File offset - unsigned short Size; -}; - struct pkgCache::Version { map_ptrloc VerStr; // Stringtable @@ -262,7 +241,6 @@ struct pkgCache::Version // Lists map_ptrloc FileList; // VerFile map_ptrloc NextVer; // Version - map_ptrloc DescriptionList; // Description map_ptrloc DependsList; // Dependency map_ptrloc ParentPkg; // Package map_ptrloc ProvidesList; // Provides @@ -274,22 +252,6 @@ struct pkgCache::Version unsigned char Priority; }; -struct pkgCache::Description -{ - // Language Code store the description translation language code. If - // the value has a 0 lenght then this is readed using the Package - // file else the Translation-CODE are used. - map_ptrloc language_code; // StringTable - map_ptrloc md5sum; // StringTable - - // Linked list - map_ptrloc FileList; // DescFile - map_ptrloc NextDesc; // Description - map_ptrloc ParentPkg; // Package - - unsigned short ID; -}; - struct pkgCache::Dependency { map_ptrloc Version; // Stringtable @@ -337,13 +299,11 @@ class pkgCache::Namespace typedef pkgCache::PkgIterator PkgIterator; typedef pkgCache::VerIterator VerIterator; - typedef pkgCache::DescIterator DescIterator; typedef pkgCache::DepIterator DepIterator; typedef pkgCache::PrvIterator PrvIterator; typedef pkgCache::PkgFileIterator PkgFileIterator; typedef pkgCache::VerFileIterator VerFileIterator; typedef pkgCache::Version Version; - typedef pkgCache::Description Description; typedef pkgCache::Package Package; typedef pkgCache::Header Header; typedef pkgCache::Dep Dep;