g++- works

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

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 8ad501e96ff4bc3fc4fc23200e15216b6cfca1cd..040c672c8ce5e455e71d2149bc0a9f7d989c7090 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgcache.cc,v 1.22 1998/12/14 08:07:29 jgg Exp $
+// $Id: pkgcache.cc,v 1.26 1999/06/04 05:54:20 jgg Exp $

 /* ######################################################################
    
    Package Cache - Accessor code for the cache
 /* ######################################################################
    
    Package Cache - Accessor code for the cache


@@ -43,7 +43,7 @@ pkgCache::Header::Header()
    
    /* Whenever the structures change the major version should be bumped,
       whenever the generator changes the minor version should be bumped. */
    
    /* Whenever the structures change the major version should be bumped,
       whenever the generator changes the minor version should be bumped. */

-   MajorVersion = 2;
+   MajorVersion = 3;

    MinorVersion = 2;
    Dirty = true;
    
    MinorVersion = 2;
    Dirty = true;
    


@@ -132,23 +132,20 @@ bool pkgCache::ReMap()
 /* This is used to generate the hash entries for the HashTable. With my
    package list from bo this function gets 94% table usage on a 512 item
    table (480 used items) */
 /* This is used to generate the hash entries for the HashTable. With my
    package list from bo this function gets 94% table usage on a 512 item
    table (480 used items) */

-unsigned long pkgCache::sHash(string Str)
+unsigned long pkgCache::sHash(string Str) const

 {
    unsigned long Hash = 0;
    for (const char *I = Str.begin(); I != Str.end(); I++)
 {
    unsigned long Hash = 0;
    for (const char *I = Str.begin(); I != Str.end(); I++)

-      Hash += *I * ((Str.end() - I + 1));
-   Header H;
-   return Hash % _count(H.HashTable);
+      Hash = 5*Hash + *I;
+   return Hash % _count(HeaderP->HashTable);

 }
 
 }
 

-unsigned long pkgCache::sHash(const char *Str)
+unsigned long pkgCache::sHash(const char *Str) const

 {
    unsigned long Hash = 0;
 {
    unsigned long Hash = 0;

-   const char *End = Str + strlen(Str);
-   for (const char *I = Str; I != End; I++)
-      Hash += *I * ((End - I + 1));
-   Header H;
-   return Hash % _count(H.HashTable);
+   for (const char *I = Str; *I != 0; I++)
+      Hash = 5*Hash + *I;
+   return Hash % _count(HeaderP->HashTable);

 }
 
                                                                        /*}}}*/
 }
 
                                                                        /*}}}*/


@@ -164,6 +161,7 @@ pkgCache::PkgIterator pkgCache::FindPkg(string Name)
       if (Pkg->Name != 0 && StrP[Pkg->Name] == Name[0] &&
          StrP + Pkg->Name == Name)
         return PkgIterator(*this,Pkg);
       if (Pkg->Name != 0 && StrP[Pkg->Name] == Name[0] &&
          StrP + Pkg->Name == Name)
         return PkgIterator(*this,Pkg);

+//      cout << "b" << flush;

    }
    return PkgIterator(*this,0);
 }
    }
    return PkgIterator(*this,0);
 }


@@ -179,6 +177,43 @@ const char *pkgCache::Priority(unsigned char Prio)
    return 0;
 }
                                                                        /*}}}*/
    return 0;
 }
                                                                        /*}}}*/

+// Cache::GetCandidateVer - Returns the Candidate install version      /*{{{*/
+// ---------------------------------------------------------------------
+/* The default just returns the highest available version that is not
+   a source and automatic */
+pkgCache::VerIterator pkgCache::GetCandidateVer(PkgIterator Pkg,
+                                               bool AllowCurrent)
+{
+   /* Not source/not automatic versions cannot be a candidate version 
+      unless they are already installed */
+   VerIterator Last(*this,0);
+   
+   for (VerIterator I = Pkg.VersionList(); I.end() == false; I++)
+   {
+      if (Pkg.CurrentVer() == I && AllowCurrent == true)
+        return I;
+      
+      for (VerFileIterator J = I.FileList(); J.end() == false; J++)
+      {
+        if ((J.File()->Flags & Flag::NotSource) != 0)
+           continue;
+
+        /* Stash the highest version of a not-automatic source, we use it
+           if there is nothing better */
+        if ((J.File()->Flags & Flag::NotAutomatic) != 0)
+        {
+           if (Last.end() == true)
+              Last = I;
+           continue;
+        }
+        
+        return I;
+      }   
+   }
+   
+   return Last;
+}
+                                                                       /*}}}*/

 
 // Bases for iterator classes                                          /*{{{*/
 void pkgCache::VerIterator::_dummy() {}
 
 // Bases for iterator classes                                          /*{{{*/
 void pkgCache::VerIterator::_dummy() {}