Reorderd error handling

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

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index b07c02a3b7bd777505852276acc3859e8673538a..5cf54b9aa257796f8c319bfaee3e96fc1cac363e 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: pkgcache.cc,v 1.27 1999/07/26 17:46:07 jgg Exp $
+// $Id: pkgcache.cc,v 1.30 1999/12/05 05:37:45 jgg Exp $
 /* ######################################################################
    
    Package Cache - Accessor code for the cache
@@ -27,6 +27,7 @@
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/strutl.h>
 #include <system.h>
 
 #include <string>
@@ -44,7 +45,7 @@ pkgCache::Header::Header()
    /* Whenever the structures change the major version should be bumped,
       whenever the generator changes the minor version should be bumped. */
    MajorVersion = 3;
-   MinorVersion = 3;
+   MinorVersion = 5;
    Dirty = true;
    
    HeaderSz = sizeof(pkgCache::Header);
@@ -136,7 +137,7 @@ unsigned long pkgCache::sHash(string Str) const
 {
    unsigned long Hash = 0;
    for (const char *I = Str.begin(); I != Str.end(); I++)
-      Hash = 5*Hash + *I;
+      Hash = 5*Hash + tolower(*I);
    return Hash % _count(HeaderP->HashTable);
 }
 
@@ -144,7 +145,7 @@ unsigned long pkgCache::sHash(const char *Str) const
 {
    unsigned long Hash = 0;
    for (const char *I = Str; *I != 0; I++)
-      Hash = 5*Hash + *I;
+      Hash = 5*Hash + tolower(*I);
    return Hash % _count(HeaderP->HashTable);
 }
 
@@ -159,9 +160,8 @@ pkgCache::PkgIterator pkgCache::FindPkg(string Name)
    for (; Pkg != PkgP; Pkg = PkgP + Pkg->NextPackage)
    {
       if (Pkg->Name != 0 && StrP[Pkg->Name] == Name[0] &&
-         StrP + Pkg->Name == Name)
+         stringcasecmp(Name.begin(),Name.end(),StrP + Pkg->Name) == 0)
         return PkgIterator(*this,Pkg);
-//      cout << "b" << flush;
    }
    return PkgIterator(*this,0);
 }
@@ -250,8 +250,7 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const
        Pkg->CurrentState == pkgCache::State::HalfConfigured)
       return NeedsConfigure;
    
-   if (Pkg->CurrentState == pkgCache::State::UnInstalled ||
-       Pkg->CurrentState == pkgCache::State::HalfInstalled ||
+   if (Pkg->CurrentState == pkgCache::State::HalfInstalled ||
        Pkg->InstState != pkgCache::State::Ok)
       return NeedsUnpack;