Configuration fixes

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

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 06cad4b16667b0983896489c41b64ef5604fb245..3e01e771de19e9edbdb1d7e9faadaff2aff98cdb 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.18 1998/11/27 00:07:24 jgg Exp $
+// $Id: pkgcache.cc,v 1.20 1998/12/07 07:26:19 jgg Exp $

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


@@ -159,7 +159,8 @@ pkgCache::PkgIterator pkgCache::FindPkg(string Name)
    Package *Pkg = PkgP + HeaderP->HashTable[Hash(Name)];
    for (; Pkg != PkgP; Pkg = PkgP + Pkg->NextPackage)
    {
    Package *Pkg = PkgP + HeaderP->HashTable[Hash(Name)];
    for (; Pkg != PkgP; Pkg = PkgP + Pkg->NextPackage)
    {

-      if (Pkg->Name != 0 && StrP + Pkg->Name == Name)
+      if (Pkg->Name != 0 && StrP[Pkg->Name] == Name[0] &&
+         StrP + Pkg->Name == Name)

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


@@ -379,9 +380,10 @@ void pkgCache::DepIterator::GlobOr(DepIterator &Start,DepIterator &End)
    // Compute a single dependency element (glob or)
    Start = *this;
    End = *this;
    // Compute a single dependency element (glob or)
    Start = *this;
    End = *this;

-   for (bool LastOR = true; end() == false && LastOR == true; (*this)++)
+   for (bool LastOR = true; end() == false && LastOR == true;)

    {
       LastOR = (Dep->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or;
    {
       LastOR = (Dep->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or;

+      (*this)++;

       if (LastOR == true)
         End = (*this);
    }
       if (LastOR == true)
         End = (*this);
    }