Remove code that isn't being used with Apple http.

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

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 3b4ff3585d3fee18033e8257abd89a2ec4495c54..1903b2ffe34cf1b4bb6bba65125739ab68eb9375 100644 (file)
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -23,9 +23,10 @@
 #include <string>
 #include <time.h>
 #include <apt-pkg/mmap.h>
+#include <apt-pkg/srkstring.h>
 
 using std::string;
-    
+
 class pkgVersioningSystem;
 class pkgCache                                                         /*{{{*/
 {
@@ -102,6 +103,7 @@ class pkgCache                                                              /*{{{*/
 
    unsigned long sHash(const string &S) const;
    unsigned long sHash(const char *S) const;
+   unsigned long sHash(const srkString &S) const;
    
    public:
    
@@ -127,12 +129,14 @@ class pkgCache                                                            /*{{{*/
    // String hashing function (512 range)
    inline unsigned long Hash(const string &S) const {return sHash(S);};
    inline unsigned long Hash(const char *S) const {return sHash(S);};
+   inline unsigned long Hash(const srkString &S) const {return sHash(S);};
 
    // Usefull transformation things
    const char *Priority(unsigned char Priority);
    
    // Accessors
    PkgIterator FindPkg(const string &Name);
+   PkgIterator FindPkg(const srkString &Name);
    Header &Head() {return *HeaderP;};
    inline PkgIterator PkgBegin();
    inline PkgIterator PkgEnd();
@@ -222,7 +226,7 @@ struct pkgCache::Package                                            /*{{{*/
    unsigned char InstState;         // Flags
    unsigned char CurrentState;      // State
    
-   unsigned short ID;
+   unsigned int ID;
    unsigned long Flags;
 };
 
@@ -243,7 +247,7 @@ struct pkgCache::PackageFile
    
    // Linked list
    map_ptrloc NextFile;        // PackageFile
-   unsigned short ID;
+   unsigned int ID;
    time_t mtime;                  // Modification time for the file
 };
                                                                        /*}}}*/
@@ -287,8 +291,9 @@ struct pkgCache::Version                                            /*{{{*/
    map_ptrloc Size;              // These are the .deb size
    map_ptrloc InstalledSize;
    unsigned short Hash;
-   unsigned short ID;
+   unsigned short ID1;
    unsigned char Priority;
+   unsigned short ID2;
 };
                                                                        /*}}}*/
 struct pkgCache::Description                                           /*{{{*/
@@ -304,7 +309,7 @@ struct pkgCache::Description                                                /*{{{*/
    map_ptrloc NextDesc;          // Description
    map_ptrloc ParentPkg;         // Package
 
-   unsigned short ID;
+   unsigned int ID;
 };
                                                                        /*}}}*/
 struct pkgCache::Dependency                                            /*{{{*/