Merge with Michael AND update PO files

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

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 0d62c647aa044965d6a336fcc1e84a765fd43a31..587d97534436b6a30fc84bcb665d7e625a25bdf8 100644 (file)
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgcache.h,v 1.24 2001/05/07 04:24:08 jgg Exp $
+// $Id: pkgcache.h,v 1.25 2001/07/01 22:28:24 jgg Exp $

 /* ######################################################################
    
    Cache - Structure definitions for the cache file
 /* ######################################################################
    
    Cache - Structure definitions for the cache file


@@ -89,7 +89,7 @@ class pkgCache
    string CacheFile;
    MMap ⤅
 
    string CacheFile;
    MMap ⤅
 

-   unsigned long sHash(string S) const;
+   unsigned long sHash(const string &S) const;

    unsigned long sHash(const char *S) const;
    
    public:
    unsigned long sHash(const char *S) const;
    
    public:


@@ -111,14 +111,14 @@ class pkgCache
    inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();};
       
    // String hashing function (512 range)
    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
    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();
    Header &Head() {return *HeaderP;};
    inline PkgIterator PkgBegin();
    inline PkgIterator PkgEnd();


@@ -261,9 +261,9 @@ struct pkgCache::Dependency
    map_ptrloc ParentVer;       // Version
    
    // Specific types of depends
    map_ptrloc ParentVer;       // Version
    
    // Specific types of depends

+   map_ptrloc ID;   

    unsigned char Type;
    unsigned char CompareOp;
    unsigned char Type;
    unsigned char CompareOp;

-   unsigned short ID;   

 };
 
 struct pkgCache::Provides
 };
 
 struct pkgCache::Provides